From ccd412b9639c0889788267a14c906d12f0314fe0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 16 Jan 2024 18:02:46 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E8=AF=84=E4=BC=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOController.java | 9 ++++ .../IProjectLawsInventoryEOService.java | 3 ++ .../ProjectLawsInventoryEOServiceImpl.java | 49 ++++++++++++++++++ .../ProjectRelatedPersonnelServiceImpl.java | 50 +++++++++++++++++++ 4 files changed, 111 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index e96cef2cc..fdd02cf82 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -19,6 +19,7 @@ import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.vo.ProjectTaskUrgVo; import com.jero.modules.system.entity.SysRole; +import com.jero.modules.system.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -587,4 +588,12 @@ public class ProjectLawsInventoryEOController extends JeroController list = projectLawsInventoryEOService.queryPlatformList(lawsInventoryId,flowFlag,cut); return Result.OK(list); } + + @AutoLog(value = "法规意见收集-评估人") + @ApiOperation(value="法规意见收集-评估人", notes="法规意见收集-评估人") + @GetMapping(value = "/getEvaluatorList") + public Result> getEvaluatorList(String documentId) { + List userList = projectLawsInventoryEOService.getEvaluatorList(documentId); + return Result.OK(userList); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 9246a402d..b50c9129d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -14,6 +14,7 @@ import com.jero.modules.project.vo.ProjectTaskUrgVo; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysRole; +import com.jero.modules.system.entity.SysUser; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; import org.springframework.web.multipart.MultipartFile; @@ -353,4 +354,6 @@ public interface IProjectLawsInventoryEOService extends IService queryPlatformList(String lawsInventoryId,String flowFlag,String cut); + + List getEvaluatorList(String documentId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index ad3f8d879..70f37a2d8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -13139,5 +13139,54 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl getEvaluatorList(String documentId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectLawsInventoryEO::getStandId,documentId); + List lawsInventoryEOList = this.list(wrapper); + //dutyTerritory + if(ObjectUtils.isEmpty(lawsInventoryEOList)){ + return new ArrayList<>(); + } + List userIdList = new ArrayList<>(); + for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) { + String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); + List personnelList = projectRelatedPersonnelService.getPersonnelList(projectLawsInventoryEO.getProjectLibraryId(),null,null, null, null, null, null, null, null); + if(ObjectUtils.isNotEmpty(personnelList) && StringUtils.isNotBlank(dutyTerritory)){ + personnelList = personnelList.stream().filter(e->dutyTerritory.equals(e.getDutyTerritory())).collect(Collectors.toList()); + //lawEngineer engineeringInterfacePerson engineerLawSet engineerAttSet + List collect1 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getLawEngineer())).map(ProjectRelatedPersonnel::getLawEngineer).collect(Collectors.toList()); + List collect2 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineeringInterfacePerson())).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.toList()); + List collect3 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerLawSet())).map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.toList()); + List collect4 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerLawSet())).map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.toList()); + + if(ObjectUtils.isNotEmpty(collect1)){ + userIdList.addAll(collect1); + } + if(ObjectUtils.isNotEmpty(collect2)){ + userIdList.addAll(collect2); + } + if(ObjectUtils.isNotEmpty(collect3)){ + userIdList.addAll(collect3); + } + if(ObjectUtils.isNotEmpty(collect4)){ + userIdList.addAll(collect4); + } + } + + } + List sysUserList = new ArrayList<>(); + if(ObjectUtils.isNotEmpty(userIdList)){ + userIdList = userIdList.stream().distinct().collect(Collectors.toList()); + sysUserList = sysUserService.querySysUserListByIdList(userIdList); + } + return sysUserList; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 74a2779ac..7a23fe902 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -371,6 +371,56 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl getPersonnelList(String projectId, + String dutyTerritoryTemp, + String lawEngineer, + String engineeringInterfacePerson, + String engineerLawSet,String engineerAttSet, + String firstLevelDutyTerritory, + String orderBy, + String orderByField) { + //查询数据 + List result = projectRelatedPersonnelMapper.queryPageList(projectId, + DictCodeEnum.DUTY_TERRITORY.getValue(), + dutyTerritoryTemp, + lawEngineer, + engineeringInterfacePerson, +// certificationEngineer + engineerLawSet, + engineerAttSet); + //查询数据里的责任领域 + List dutyTerritory = result.stream().map(e -> e.getDutyTerritory()).collect(Collectors.toList()); + //查标签内容里的责任领域数据 + List sysDictItemValueList = sysDictItemMapper.selectItemValueByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); + //没有数据->新增所有责任领域,查询 + if(StringUtils.isBlank(dutyTerritoryTemp) + && StringUtils.isBlank(lawEngineer) + && StringUtils.isBlank(engineeringInterfacePerson) +// && StringUtils.isBlank(certificationEngineer) + && StringUtils.isBlank(engineerLawSet) + && StringUtils.isBlank(engineerLawSet)){ + if(result.size() != sysDictItemValueList.size()){ + + //更新相关人员表里的责任领域数据 + if (CollectionUtils.isNotEmpty(sysDictItemValueList)) { + for (String sysDictItemValue : sysDictItemValueList) { + if(!dutyTerritory.contains(sysDictItemValue)) { + setDutyTerritoryValue(sysDictItemValue, projectId); + } + } + } + //重新查询列表 + result = projectRelatedPersonnelMapper.queryPageList(projectId, + DictCodeEnum.DUTY_TERRITORY.getValue(), + dutyTerritoryTemp, + lawEngineer, + engineeringInterfacePerson, + engineerLawSet, + engineerAttSet); + } + } + return result; + } private void hearSort(String orderBy, String orderByField, List result) { Collator comparator = Collator.getInstance(Locale.CHINESE); From 8f2b5c88024e4475f1c4844bda2b4d2d8306fe50 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Jan 2024 09:52:07 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E8=AF=84=E4=BC=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 70f37a2d8..857f00168 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -13156,29 +13156,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) { String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); + //每条下的相关责任名单 List personnelList = projectRelatedPersonnelService.getPersonnelList(projectLawsInventoryEO.getProjectLibraryId(),null,null, null, null, null, null, null, null); if(ObjectUtils.isNotEmpty(personnelList) && StringUtils.isNotBlank(dutyTerritory)){ - personnelList = personnelList.stream().filter(e->dutyTerritory.equals(e.getDutyTerritory())).collect(Collectors.toList()); + //通过每条法规清单的责任领域去过滤相关人员名单 + personnelList = personnelList.stream().filter(e->dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList()); //lawEngineer engineeringInterfacePerson engineerLawSet engineerAttSet List collect1 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getLawEngineer())).map(ProjectRelatedPersonnel::getLawEngineer).collect(Collectors.toList()); List collect2 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineeringInterfacePerson())).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.toList()); List collect3 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerLawSet())).map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.toList()); - List collect4 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerLawSet())).map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.toList()); + List collect4 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerAttSet())).map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(collect1)){ - userIdList.addAll(collect1); + for (String s : collect1) { + userIdList.addAll(Arrays.asList(s.split(","))); + } } if(ObjectUtils.isNotEmpty(collect2)){ - userIdList.addAll(collect2); + for (String s : collect2) { + userIdList.addAll(Arrays.asList(s.split(","))); + } } if(ObjectUtils.isNotEmpty(collect3)){ - userIdList.addAll(collect3); + for (String s : collect3) { + userIdList.addAll(Arrays.asList(s.split(","))); + } } if(ObjectUtils.isNotEmpty(collect4)){ - userIdList.addAll(collect4); + for (String s : collect4) { + userIdList.addAll(Arrays.asList(s.split(","))); + } } } - } List sysUserList = new ArrayList<>(); if(ObjectUtils.isNotEmpty(userIdList)){ From 39b9cb794f73ff8cd8eae07e580ce9b90bc155ad Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 17 Jan 2024 10:09:50 +0800 Subject: [PATCH 03/11] =?UTF-8?q?feature(=E5=8F=82=E6=95=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=AE=A1=E7=90=86):=20=E5=8E=BB=E6=8E=89=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=88=97=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameter/ParameterTemplate/index.vue | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 8ca2b8352..f52c5c966 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -23,6 +23,15 @@ :triggerChange="false" :dictCode="'region'"/> + +
+
+ {{$t('updated')}} +
+ +
+ {{$t('reset')}} @@ -256,14 +265,14 @@ ellipsis: true, dataIndex: 'maintainerName' }, - { - title: this.$t('created'), - align: 'left', - dataIndex: 'createTime', - width: 200, - sorter: true, - ellipsis: true - }, + // { + // title: this.$t('created'), + // align: 'left', + // dataIndex: 'createTime', + // width: 200, + // sorter: true, + // ellipsis: true + // }, { title: this.$t('updated'), align: 'left', @@ -281,6 +290,7 @@ } ], queryParam: {}, + updateTime: [], areaVisible: false, paramsTemplateName: '' } @@ -290,6 +300,12 @@ }, methods: { ...mapGetters(['userInfo']), + onChangeUpdateTime(values) { + let StartTime = values[0].format('YYYY-MM-DD') + let EndTime = values[1].format('YYYY-MM-DD') + this.queryParam.updateTimeStart = StartTime + this.queryParam.updateTimeEnd = EndTime + }, subscribeClick(val) { let _this = this this.$confirm({ From 0a7e6540e8d049d95ec626e231acadc82d165951 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Jan 2024 10:12:39 +0800 Subject: [PATCH 04/11] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85--?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/service/impl/OtaManageApplyEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 4942f81fb..2adbbd726 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -901,7 +901,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl Date: Wed, 17 Jan 2024 10:25:54 +0800 Subject: [PATCH 05/11] =?UTF-8?q?feature(=E5=8F=82=E6=95=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=AE=A1=E7=90=86):=20=E5=8E=BB=E6=8E=89=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=88=97=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/parameter/ParameterTemplate/index.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index f52c5c966..3861d489b 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -28,8 +28,11 @@
{{$t('updated')}}
- + @@ -301,6 +304,11 @@ methods: { ...mapGetters(['userInfo']), onChangeUpdateTime(values) { + if (!values || values.length === 0) { + this.queryParam.updateTimeStart = '' + this.queryParam.updateTimeEnd = '' + return + } let StartTime = values[0].format('YYYY-MM-DD') let EndTime = values[1].format('YYYY-MM-DD') this.queryParam.updateTimeStart = StartTime @@ -556,6 +564,7 @@ searchReset() { this.pageNo = 1 this.queryParam = {} + this.updateTime = [] this.getList() }, pageOnChange(page, pageSize) { From b9434ec80656b16ea66ac9098d7d33b47da04197 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Jan 2024 10:54:31 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsTemplateEOController.java | 11 ++++++++++- .../cert/template/entity/ParamsTemplateEO.java | 12 ++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java index 581f6ab09..73b0663b4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java @@ -43,6 +43,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.text.Collator; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -112,7 +114,14 @@ public class ParamsTemplateEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = paramsTemplateEOService.page(page, queryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java index c98b63b13..f949624cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java @@ -57,15 +57,15 @@ public class ParamsTemplateEO implements Serializable { private java.util.Date updateTime; @TableField(exist = false) - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "最新变更时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "变更起始时间") private java.util.Date updateTimeStart; @TableField(exist = false) - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "最新变更时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "变更结束时间") private java.util.Date updateTimeEnd; /**所属部门*/ From ae5e3bcdd4b9a60865edf32a19367bb11ea6fc9d Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 17 Jan 2024 11:31:42 +0800 Subject: [PATCH 07/11] =?UTF-8?q?feature(=E6=B3=95=E8=A7=84=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=94=B6=E9=9B=86-=E5=8F=91=E8=B5=B7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B):=20=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0=E4=BA=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 1eb8bf805..270fce171 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -61,12 +61,22 @@ {{$t('Assessor')}} - + + + + + + + + + {{ i.username }} + + @@ -156,7 +166,8 @@ //url传参严格按照当前命名 url: { seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段 - addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy' + addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy', + getEvaluatorList: '/project/projectLawsInventoryEO/getEvaluatorList', }, loading: false, JLoading: false, @@ -243,7 +254,8 @@ width: 150, dataIndex: 'corresponding_standard' } - ] + ], + evaluatorIdsNameOptions: [], } }, mounted() { @@ -262,6 +274,14 @@ }, methods: { ...mapGetters(['userInfo']), + getEvaluatorList () { + const query = { documentId: this.selectedRowKeysRecord[0].id } + getAction(this.url.getEvaluatorList, query).then((res) => { + if (res.success) { + this.evaluatorIdsNameOptions = res.result + } + }) + }, disabledDate(current) { return current && current < moment().subtract(1, 'day') }, @@ -302,6 +322,7 @@ return res.id == this.selectedRowKeys[0] }) this.selectedRowKeysRecord = [...this.selectedRowKeysRecord] + this.getEvaluatorList() }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() From de9f504959d82c0dfa9d270d1f79e7bf394f96c5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Jan 2024 16:40:54 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 857f00168..f6e503dbf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -13190,9 +13190,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUserList = new ArrayList<>(); - if(ObjectUtils.isNotEmpty(userIdList)){ + if(ObjectUtils.isNotEmpty(userIdList)) { userIdList = userIdList.stream().distinct().collect(Collectors.toList()); sysUserList = sysUserService.querySysUserListByIdList(userIdList); + //排序 + Collator comparator = Collator.getInstance(Locale.CHINESE); + Collections.sort(sysUserList, (e1, e2) -> { + String e1Username = StringUtils.isNotBlank(e1.getUsername()) ? e1.getUsername() : ""; + String e2Username = StringUtils.isNotBlank(e2.getUsername()) ? e2.getUsername() : ""; + return comparator.compare(e1Username, e2Username); + }); } return sysUserList; } From 20aeb8359d7760cf4a72de388d0d21c00a1013bc Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 17 Jan 2024 16:58:41 +0800 Subject: [PATCH 09/11] =?UTF-8?q?feature(=E6=B3=95=E8=A7=84=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=94=B6=E9=9B=86-=E5=8F=91=E8=B5=B7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B):=20=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0=E4=BA=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 270fce171..ce6019b82 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -60,17 +60,19 @@ * {{$t('Assessor')}} - + + + @@ -192,6 +194,13 @@ trigger: 'change' } ], + evaluatorIds: [ + { + required: true, + message: this.$t('Assessor') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], brands: [ { required: true, @@ -275,6 +284,10 @@ methods: { ...mapGetters(['userInfo']), getEvaluatorList () { + this.$set(this.formInline, 'evaluatorIds', []) + if (this.selectedRowKeysRecord.length === 0) { + return this.evaluatorIdsNameOptions = [] + } const query = { documentId: this.selectedRowKeysRecord[0].id } getAction(this.url.getEvaluatorList, query).then((res) => { if (res.success) { From 62487cf7614c11f1611bc41df86e4eff514ec699 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 17 Jan 2024 17:35:29 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix(=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0=E4=BA=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index ce6019b82..72d7a6744 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -72,7 +72,8 @@ @@ -162,6 +163,17 @@ PersonnelSelection }, mixins:[ResizeHeader, ResizeColumnProvide], + computed: { + evaluatorIds () { + if (this.formInline.evaluatorIds && this.formInline.evaluatorIds instanceof Array) { + return this.formInline.evaluatorIds + } + if (this.formInline.evaluatorIds && typeof(this.formInline.evaluatorIds)==='string') { + return this.formInline.evaluatorIds.split(',') + } + return [] + } + }, data() { return { title: this.$t('regulationEngineerInitiateProcess'), @@ -283,6 +295,9 @@ }, methods: { ...mapGetters(['userInfo']), + evaluatorIdsChange (val) { + this.formInline.evaluatorIds = val + }, getEvaluatorList () { this.$set(this.formInline, 'evaluatorIds', []) if (this.selectedRowKeysRecord.length === 0) { From b370f4841b99264c0c8427573802ca6fde57e1cc Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Jan 2024 17:39:01 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PlatformProjectLawsInventoryEOServiceImpl.java | 2 +- .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 9f6459510..544527c17 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -9317,7 +9317,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl