From e2e1f35c8f172c50d6ac48be6a1046da957c8b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 15:09:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=9C=A8=E8=BD=AC=E5=8A=9E=E6=97=81?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=89=80=E9=80=89=E4=BA=BA=E5=91=98=20?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95--=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=9B=AE=E5=BD=95-=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/SelectedBy/index.vue | 15 ++- .../components/certificationDirectoryAdd.vue | 108 ++++++++++++------ .../reviewedByThePersonInCharge.vue | 10 +- 3 files changed, 93 insertions(+), 40 deletions(-) diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue index 35711e606..13c9683ae 100644 --- a/jero-web/src/components/SelectedBy/index.vue +++ b/jero-web/src/components/SelectedBy/index.vue @@ -67,7 +67,8 @@ departId: '', defaultExpandedKeys: [], submitLoading: false, - visibleTree: false + visibleTree: false, + userName: [] } }, mounted() { @@ -110,7 +111,7 @@ } if (this.userIds && this.userIds.length > 0) { this.submitLoading = true - this.$emit('SelectedByForm', this.userIds.join(',')) + this.$emit('SelectedByForm', this.userIds.join(','),this.userName.join(',')) } else { this.$message.warning(this.$t('selectLeastOne')) } @@ -142,7 +143,7 @@ postAction('sys/user/queryDepartUserTreeList', { departId: this.departId, json: gData, - flag:'1' + flag: '1' }).then((res) => { this.confirmLoading = false if (res.success) { @@ -155,8 +156,14 @@ } }) }, - checkChange(e) { + checkChange(e, name) { + this.userName = [] this.userIds = e + if (name.checkedNodes && name.checkedNodes.length > 0) { + name.checkedNodes.forEach(res => { + this.userName.push(res.data.props.dataRef.title) + }) + } } } } diff --git a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue index 59c7a4b5c..1179cf11d 100644 --- a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue +++ b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue @@ -10,14 +10,14 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> - +
{{$t('directoryName')}}
- + {{$t('batch')}}
- + {{$t('testReportLocation')}} - + {{$t('explain')}} - + { + this.$refs.ruleForm.clearValidate() + }) }, edit(val) { this.visible = true this.$nextTick(() => { this.formInline = val + this.$refs.ruleForm.clearValidate() }) }, handleCancel() { this.visible = false }, handleSubmit() { - if (!this.formInline.directoryName && !this.formInline.lot && !this.formInline.directoryFile && - !this.formInline.experimentFile && !this.formInline.detectionReportLocation && !this.formInline.explainInfo) { - this.$message.warning(this.$t('dataCannotEmpty')) - } else { - let Action - let url = '' - if (this.formInline.id) { - url = this.url.edit - Action = putAction - } else { - url = this.url.add - Action = postAction - } - let query = { - projectLibraryId: this.$route.query.id, - ...this.formInline - } - this.confirmLoading = true - Action(url, query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.confirmLoading = false - this.$emit('certificationDirectoryList') - } else { - this.confirmLoading = false - this.$message.warning(res.message) - } - }) - } + this.$refs.ruleForm.validate(valid => { + if (valid){ + if (!this.formInline.directoryName && !this.formInline.lot && !this.formInline.directoryFile && + !this.formInline.experimentFile && !this.formInline.detectionReportLocation && !this.formInline.explainInfo) { + this.$message.warning(this.$t('dataCannotEmpty')) + } else { + let Action + let url = '' + if (this.formInline.id) { + url = this.url.edit + Action = putAction + } else { + url = this.url.add + Action = postAction + } + let query = { + projectLibraryId: this.$route.query.id, + ...this.formInline + } + this.confirmLoading = true + Action(url, query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('certificationDirectoryList') + } else { + this.confirmLoading = false + this.$message.warning(res.message) + } + }) + } + } + }) }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 82e7dcb05..8b31bb419 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -49,6 +49,9 @@ {{$t('turnToDo')}} + + {{this.formInline.dezrrSubmitUserName}} + @@ -184,16 +187,21 @@ } else { this.$refs.SelectedByRef.visible = false this.formInline.secondChargePersonUserId = '' + this.formInline.dezrrSubmitUserName = '' + this.formInline.dezrrSubmitUserId = '' } }, //转办接口 - SelectedByForm(userIds) { + SelectedByForm(userIds, name) { if (this.query.TaskKey == 'zrrtjjfw') { this.formInline.dezrrSubmitUserId = userIds } else { this.formInline.secondChargePersonUserId = userIds } + this.formInline.dezrrSubmitUserName = name + this.formInline = { ...this.formInline } this.$refs.SelectedByRef.visible = false + this.$refs.SelectedByRef.submitLoading = false }, submitNoRule(callBack) { callBack(this.formInline) From 5575134a499a6b4cea0956935243a77e442afab6 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 28 Mar 2023 15:10:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E5=AE=8C=E5=96=84=E3=80=82?= =?UTF-8?q?67009?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/ISysUserService.java | 8 + .../service/impl/SysUserServiceImpl.java | 15 + ...ctCertificationInventoryEOServiceImpl.java | 547 +++++++++++++----- 3 files changed, 436 insertions(+), 134 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index 160d50570..fb1881817 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -311,4 +311,12 @@ public interface ISysUserService extends IService { * @return */ String getUserThirdIdByUserId(List sysUserList, String userId); + + /** + * 根据用户id，获取用户名 + * @param sysUserList + * @param userId + * @return + */ + String getUsernameByUserId(List sysUserList, String userId); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index ef7fd2b2e..4f8cc64cb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -782,4 +782,19 @@ public class SysUserServiceImpl extends ServiceImpl impl } return result; } + + @Override + public String getUsernameByUserId(List sysUserList, String userId) { + String result = ""; + if(CollectionUtils.isNotEmpty(sysUserList)){ + result = sysUserList.stream().filter(user -> { + boolean flag = false; + if (org.apache.commons.lang3.StringUtils.equals(userId, user.getId())) { + flag = true; + } + return flag; + }).map(SysUser::getUsername).collect(Collectors.joining(",")); + } + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 3c130b781..bc470b601 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -220,8 +220,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl savePciLogParams = new HashMap<>(); + List editBeforePciList = new ArrayList<>(); + editBeforePciList.add(editBeforePciEo); + List editAfterPciList = new ArrayList<>(); + editAfterPciList.add(projectCertificationInventoryEO); + savePciLogParams.put("editBeforePciList",editBeforePciList); + savePciLogParams.put("editAfterPciList",editAfterPciList); + savePciLogParams.put("operatorType",OperatorTypeEnum.CERTIFICATION_INVENTORY_EDIT.getValue()); + this.saveProjectCertificationInventoryLog(savePciLogParams); - Date now = new Date(); + Date now = new Date(); projectCertificationInventoryEO.setUpdateTime(now); saveOrUpdate(projectCertificationInventoryEO); //设置权限 先删后加 @@ -325,32 +336,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); - for (ProjectCertificationInventoryEO certificationInventoryEO : saveDataList) { - StringBuilder contentCnSb = new StringBuilder(); - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); - contentCnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" "); - contentCnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" "); - contentCnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" "); - contentCnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\"").append(" "); - - StringBuilder contentEnSb = new StringBuilder(); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); - contentEnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" "); - contentEnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" "); - contentEnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" "); - contentEnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\""); - - - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(certificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCnSb.toString()); - projectCertificationInventoryLogEO.setContentEn(contentEnSb.toString()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); - } - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); + this.saveProjectCertificationInventoryLog(saveDataList,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue()); } }catch (Exception ex){ throw new JeroBootException("添加失败！"); @@ -804,6 +790,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); - - String contentCn = "\"" + currentUser.getUsername() + "\"" +"审核退回"; - String contentEn = "\"" + currentUser.getUsername() + "\"" +" review and returned"; - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue()); ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class); List dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); @@ -1323,24 +1299,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); - for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); - - String contentCn = "\"" + currentUser.getUsername() + "\"" +"审核通过"; - String contentEn = "\"" + currentUser.getUsername() + "\"" +" pass the audit"; - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue()); ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class); List dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); @@ -1449,36 +1412,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); // 数据更新为结果待审查 for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); - - String contentCn = ""; - String contentEn = ""; - if (StringUtils.equals(projectCertificationInventoryEO.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) { - String fileName = "N/A"; - if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliveryResult())) { - fileName = this.ossFileService.getFileInfos(projectCertificationInventoryEO.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - } - contentCn = "\"" + currentUser.getUsername() + "\"" +"提交了附件 " + fileName; - contentEn = "\"" + currentUser.getUsername() + "\"" +" submitted attachment " + fileName; - }else { - String deliveryResult = (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliveryResult()) ? projectCertificationInventoryEO.getDeliveryResult() : "N/A"); - contentCn = "\"" + currentUser.getUsername() + "\"" +"提交了交付结果为" + deliveryResult; - contentEn = "\"" + currentUser.getUsername() + "\"" +" submitted a delivery result of " + deliveryResult; - } - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue()); List certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList); @@ -1546,7 +1485,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); List processInfoDetailEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); @@ -1556,20 +1494,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); - for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()); - - String contentCn = "\"" + currentUser.getUsername() + "\"" +"退回了任务信息"; - String contentEn = "\"" + currentUser.getUsername() + "\"" +" returned the task information"; - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue()); String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -1842,22 +1756,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()); + } - String contentCn = "\"" + currentUser.getUsername() + "\"" +"拒绝，流程退回至" + "\"" +studioEngineerUserInfo.get(0).getUsername()+"\""; - String contentEn = "\"" + currentUser.getUsername() + "\"" +" refuses, and the process returns to " + "\"" +studioEngineerUserInfo.get(0).getUsername()+"\""; - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); - } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue()); Map standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList); String standName = (String) standNameAndItemName.get("standName"); @@ -1959,7 +1862,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson)); try { - List projectCertificationInventoryLogEOList = new ArrayList<>(); // 给责任人分配待办中心的任务 List processInfoDetailEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { @@ -1970,20 +1872,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -2122,6 +2015,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList); + queryWrapper.lambda().ne(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); List projectCertificationInventoryEOList = this.list(queryWrapper); // 根据结束时间进行排序，获取最近的时间，发消息时使用。 @@ -2144,7 +2038,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl updateWrap = new LambdaUpdateWrapper<>(); updateWrap.set(ProjectCertificationInventoryEO::getDeliveryResult,null); - // 流程重置，清空截止日期， 撤回不清空。 对应禅道问题：67048 if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){ updateWrap.set(ProjectCertificationInventoryEO::getEndTime,null); @@ -2155,6 +2048,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); if(CollectionUtils.isNotEmpty(certificationEngineerList)){ for (String certificationEngineerId : certificationEngineerIdList) { String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerList,certificationEngineerId); @@ -3348,4 +3242,389 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl pciList,String operateType){ + if(CollectionUtils.isNotEmpty(pciList)){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String projectLibraryId = pciList.get(0).getProjectLibraryId(); + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); + + List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); + String certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(",")); + + List pciLogEOList = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci : pciList) { + StringBuilder contentCnSb = new StringBuilder(); + StringBuilder contentEnSb = new StringBuilder(); + if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); + contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); + + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); + contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发布了认证清单"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue())){ + if (StringUtils.equals(pci.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) { + String fileName = "N/A"; + if (StringUtils.isNotEmpty(pci.getDeliveryResult())) { + fileName = this.ossFileService.getFileInfos(pci.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + } + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了附件 ").append(fileName); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted attachment ").append(fileName); + }else { + String deliveryResult = (StringUtils.isNotEmpty(pci.getDeliveryResult()) ? pci.getDeliveryResult() : "N/A"); + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了交付结果为").append(deliveryResult); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted a delivery result of ").append(deliveryResult); + } + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("接受了任务信息"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝，流程退回至") + .append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\""); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ") + .append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("操作了流程重置功能"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has operated the process reset function"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("从").append("\"").append(certificationEngineerUserNames).append("\"撤回了流程"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" withdrew the process from \"").append(certificationEngineerUserNames).append("\""); + } + + ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO(); + pciLogEO.setProjectCertificationInventoryId(pci.getId()); + pciLogEO.setContentCn(contentCnSb.toString()); + pciLogEO.setContentEn(contentEnSb.toString()); + pciLogEO.setOperatorType(operateType); + pciLogEOList.add(pciLogEO); + } + + if(CollectionUtils.isNotEmpty(pciLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList); + } + } + } + + /** + * 保存认证清单修改历史（编辑、批量设置专用） + * @param params + */ + public void saveProjectCertificationInventoryLog(Map params){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List editBeforePciList = (List) params.get("editBeforePciList"); + List editAfterPciList = (List) params.get("editAfterPciList"); + String operatorType = (String) params.get("operatorType"); + + if(CollectionUtils.isNotEmpty(editBeforePciList) && CollectionUtils.isNotEmpty(editAfterPciList)){ + List categoryList = this.sysCategoryService.list(); + List sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll(); + + List beforeSdtUserIdList = editBeforePciList.stream().map(ProjectCertificationInventoryEO::getSdt).distinct().collect(Collectors.toList()); + List beforeDutyPersonUserIdList = editBeforePciList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); + + List afterSdtUserIdList = editAfterPciList.stream().map(ProjectCertificationInventoryEO::getSdt).distinct().collect(Collectors.toList()); + List afterDutyPersonUserIdList = editAfterPciList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); + List userIdList = new ArrayList<>(); + userIdList.addAll(beforeSdtUserIdList); + userIdList.addAll(beforeDutyPersonUserIdList); + userIdList.addAll(afterSdtUserIdList); + userIdList.addAll(afterDutyPersonUserIdList); + List userList = this.sysUserService.querySysUserListByIdList(userIdList); + + List beforeDeliverableTemplateIdList = editBeforePciList.stream().map(ProjectCertificationInventoryEO::getDeliverableTemplate).distinct().collect(Collectors.toList()); + List afterDeliverableTemplateIdList = editAfterPciList.stream().map(ProjectCertificationInventoryEO::getDeliverableTemplate).distinct().collect(Collectors.toList()); + List allDeliverableTemplateIdList = new ArrayList<>(); + allDeliverableTemplateIdList.addAll(beforeDeliverableTemplateIdList); + allDeliverableTemplateIdList.addAll(afterDeliverableTemplateIdList); + List allDeliverableTemplateList = this.ossFileService.getFileInfos(allDeliverableTemplateIdList.stream().distinct().collect(Collectors.joining(","))); + + List pciLogEOList = new ArrayList<>(); + + for (ProjectCertificationInventoryEO editAfterPciEo : editAfterPciList) { + List editBeforePciListTemp = editBeforePciList.stream().filter(editBeforePciEo -> { + boolean flag = false; + if (StringUtils.equals(editAfterPciEo.getId(), editBeforePciEo.getId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(editBeforePciListTemp)){ + boolean savePciLogFlag = false; + ProjectCertificationInventoryEO editBeforePciEo = editBeforePciListTemp.get(0); + + if(ObjectUtils.isNotEmpty(editBeforePciEo)){ + StringBuilder contentCnSb = new StringBuilder(); + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("将"); + StringBuilder contentEnSb = new StringBuilder(); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" changes the "); + + if(!StringUtils.equals(editBeforePciEo.getWvtaId(),editAfterPciEo.getWvtaId())){ + contentCnSb.append("\"").append("WVTA ID").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getWvtaId()) ? editBeforePciEo.getWvtaId() : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getWvtaId()) ? editAfterPciEo.getWvtaId() : "空") + .append(","); + + contentEnSb.append("\"").append("WVTA ID").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getWvtaId()) ? editBeforePciEo.getWvtaId() : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getWvtaId()) ? editAfterPciEo.getWvtaId() : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getCategory(),editAfterPciEo.getCategory())){ + contentCnSb.append("\"").append("类别").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getCategory()) ? editBeforePciEo.getCategory() : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getCategory()) ? editAfterPciEo.getCategory() : "空") + .append(","); + + contentEnSb.append("\"").append("Category").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getCategory()) ? editBeforePciEo.getCategory() : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getCategory()) ? editAfterPciEo.getCategory() : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getInspectionItem(),editAfterPciEo.getInspectionItem())){ + contentCnSb.append("\"").append("检验项目").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getInspectionItem()) ? editBeforePciEo.getInspectionItem() : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getInspectionItem()) ? editAfterPciEo.getInspectionItem() : "空") + .append(","); + + contentEnSb.append("\"").append("Inspection Items").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getInspectionItem()) ? editBeforePciEo.getInspectionItem() : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getInspectionItem()) ? editAfterPciEo.getInspectionItem() : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getConfigItem(),editAfterPciEo.getConfigItem())){ + contentCnSb.append("\"").append("配置项").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getConfigItem()) ? editBeforePciEo.getConfigItem() : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getConfigItem()) ? editAfterPciEo.getConfigItem() : "空") + .append(","); + + contentEnSb.append("\"").append("Configuration Item").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getConfigItem()) ? editBeforePciEo.getConfigItem() : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getConfigItem()) ? editAfterPciEo.getConfigItem() : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getDutyTerritory(),editAfterPciEo.getDutyTerritory())){ + String beforeDutyTerritoryNameCn = this.sysDictItemService.disposeShowDictItemValue( + sysDictItems, + editBeforePciEo.getDutyTerritory(), + CutEnum.CN.getValue(), + ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue() + ); + String beforeDutyTerritoryNameEn = this.sysDictItemService.disposeShowDictItemValue( + sysDictItems, + editBeforePciEo.getDutyTerritory(), + CutEnum.EN.getValue(), + ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue() + ); + + String afterDutyTerritoryNameCn = this.sysDictItemService.disposeShowDictItemValue( + sysDictItems, + editAfterPciEo.getDutyTerritory(), + CutEnum.CN.getValue(), + ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue() + ); + String afterDutyTerritoryNameEn = this.sysDictItemService.disposeShowDictItemValue( + sysDictItems, + editAfterPciEo.getDutyTerritory(), + CutEnum.EN.getValue(), + ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue() + ); + + contentCnSb.append("\"").append("责任领域").append("\" ") + .append(StringUtils.isNotEmpty(beforeDutyTerritoryNameCn) ? beforeDutyTerritoryNameCn : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterDutyTerritoryNameCn) ? afterDutyTerritoryNameCn : "空") + .append(","); + + contentEnSb.append("\"").append("Responsible Field").append("\" ") + .append(StringUtils.isNotEmpty(beforeDutyTerritoryNameEn) ? beforeDutyTerritoryNameEn : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterDutyTerritoryNameEn) ? afterDutyTerritoryNameEn : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getDeliverableType(),editAfterPciEo.getDeliverableType())){ + String beforeDeliverableTypeNameCn = this.getTreeName(CutEnum.CN.getValue(), categoryList, Arrays.asList(editBeforePciEo.getDeliverableType().split(","))); + String beforeDeliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(editBeforePciEo.getDeliverableType().split(","))); + + String afterDeliverableTypeNameCn = this.getTreeName(CutEnum.CN.getValue(), categoryList, Arrays.asList(editAfterPciEo.getDeliverableType().split(","))); + String afterDeliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(editAfterPciEo.getDeliverableType().split(","))); + + contentCnSb.append("\"").append("交付物类型").append("\" ") + .append(StringUtils.isNotEmpty(beforeDeliverableTypeNameCn) ? beforeDeliverableTypeNameCn : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterDeliverableTypeNameCn) ? afterDeliverableTypeNameCn : "空") + .append(","); + + contentEnSb.append("\"").append("Deliverable Type").append("\" ") + .append(StringUtils.isNotEmpty(beforeDeliverableTypeNameEn) ? beforeDeliverableTypeNameEn : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterDeliverableTypeNameEn) ? afterDeliverableTypeNameEn : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getDeliverableTemplate(),editAfterPciEo.getDeliverableTemplate())){ + String[] beforeDeliverableTemplateArr = StringUtils.isNotEmpty(editBeforePciEo.getDeliverableTemplate()) ? editBeforePciEo.getDeliverableTemplate().split(",") : null; + String[] afterDeliverableTemplateArr = StringUtils.isNotEmpty(editAfterPciEo.getDeliverableTemplate()) ? editAfterPciEo.getDeliverableTemplate().split(",") : null; + + String beforeDeliverableTemplateName = allDeliverableTemplateList.stream().filter(file -> { + boolean flag = false; + if(beforeDeliverableTemplateArr != null){ + for (String beforeDeliverableTemplate : beforeDeliverableTemplateArr) { + if(StringUtils.equals(file.getId(),beforeDeliverableTemplate)){ + flag = true; + } + } + } + return flag; + }).map(OSSFile::getFileName).collect(Collectors.joining(",")); + + String afterDeliverableTemplateName = allDeliverableTemplateList.stream().filter(file -> { + boolean flag = false; + if(afterDeliverableTemplateArr != null){ + for (String afterDeliverableTemplate : afterDeliverableTemplateArr) { + if(StringUtils.equals(file.getId(),afterDeliverableTemplate)){ + flag = true; + } + } + } + return flag; + }).map(OSSFile::getFileName).collect(Collectors.joining(",")); + + contentCnSb.append("\"").append("交付物模板").append("\" ") + .append(StringUtils.isNotEmpty(beforeDeliverableTemplateName) ? beforeDeliverableTemplateName : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterDeliverableTemplateName) ? afterDeliverableTemplateName : "空") + .append(","); + + contentEnSb.append("\"").append("Deliverable Template").append("\" ") + .append(StringUtils.isNotEmpty(beforeDeliverableTemplateName) ? beforeDeliverableTemplateName : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterDeliverableTemplateName) ? afterDeliverableTemplateName : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getSdt(),editAfterPciEo.getSdt())){ + String beforeSdtUserName = this.sysUserService.getUsernameByUserId(userList,editBeforePciEo.getSdt()); + String afterSdtUserName = this.sysUserService.getUsernameByUserId(userList,editAfterPciEo.getSdt()); + + contentCnSb.append("\"").append("工程接口人").append("\" ") + .append(StringUtils.isNotEmpty(beforeSdtUserName) ? beforeSdtUserName : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterSdtUserName) ? afterSdtUserName : "空") + .append(","); + + contentEnSb.append("\"").append("Eng. Interface").append("\" ") + .append(StringUtils.isNotEmpty(beforeSdtUserName) ? beforeSdtUserName : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterSdtUserName) ? afterSdtUserName : "null") + .append(","); + + savePciLogFlag = true; + } + String beforeEndTimeStr = ""; + if(editBeforePciEo.getEndTime() != null){ + beforeEndTimeStr = DateUtils.formatDate(editBeforePciEo.getEndTime()); + } + String afterEndTimeStr = ""; + if(editAfterPciEo.getEndTime() != null){ + afterEndTimeStr = DateUtils.formatDate(editAfterPciEo.getEndTime()); + } + if(!StringUtils.equals(beforeEndTimeStr,afterEndTimeStr)){ + contentCnSb.append("\"").append("截止日期").append("\" ") + .append(StringUtils.isNotEmpty(beforeEndTimeStr) ? beforeEndTimeStr : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterEndTimeStr) ? afterEndTimeStr : "空") + .append(","); + + contentEnSb.append("\"").append("Due Date").append("\" ") + .append(StringUtils.isNotEmpty(beforeEndTimeStr) ? beforeEndTimeStr : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterEndTimeStr) ? afterEndTimeStr : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getDutyPerson(),editAfterPciEo.getDutyPerson())){ + String beforeDutyPersonUserName = this.sysUserService.getUsernameByUserId(userList,editBeforePciEo.getDutyPerson()); + String afterDutyPersonUserName = this.sysUserService.getUsernameByUserId(userList,editAfterPciEo.getDutyPerson()); + + contentCnSb.append("\"").append("责任人").append("\" ") + .append(StringUtils.isNotEmpty(beforeDutyPersonUserName) ? beforeDutyPersonUserName : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterDutyPersonUserName) ? afterDutyPersonUserName : "空") + .append(","); + + contentEnSb.append("\"").append("Assignee").append("\" ") + .append(StringUtils.isNotEmpty(beforeDutyPersonUserName) ? beforeDutyPersonUserName : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterDutyPersonUserName) ? afterDutyPersonUserName : "null") + .append(","); + + savePciLogFlag = true; + } + + if(savePciLogFlag){ + ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO(); + pciLogEO.setProjectCertificationInventoryId(editAfterPciEo.getId()); + pciLogEO.setContentCn(contentCnSb.toString().substring(0,contentCnSb.toString().length()-1)); + pciLogEO.setContentEn(contentEnSb.toString().substring(0,contentEnSb.toString().length()-1)); + pciLogEO.setOperatorType(operatorType); + pciLogEOList.add(pciLogEO); + } + } + } + } + if(CollectionUtils.isNotEmpty(pciLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList); + } + } + } } From 2adc1d2aaad6f7a6c669f22db9885cb03b011bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 28 Mar 2023 15:15:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=9A=84=E5=A4=87=E6=B3=A8-=E5=89=8D=E6=AE=B5?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4fde5dc19..3e270c66d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1819,8 +1819,8 @@ module.exports = { pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程', complianceReporting:'合规报告', youCanOnlySelectStatusClearSubmit:'只能选择流程状态为清单待提交的数据', - note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范', - format:'支持doc/docx/pdf格式,大小50M以内', + note:'注:附件包括测试项目清单、测试报告、测试标准或技术规范', + format:'支持doc/docx/pdf格式，大小50M以内', cantTransferToYourself:"不能转办给自己", noteone:'注:支持CSV格式，大小20M以内，数量1-20个', notecsv:'注:支持CSV格式，大小20M以内', From a6ffee09730aff3d012979a154cad8d55edb4488 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 15:34:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=89=A9=E4=BD=99=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AD=97=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradecompletion.vue | 1 + .../otamanagement/upgradeactivity/index.vue | 2 +- .../thetargetvehicleofthisupgrade.vue | 2 ++ .../components/upgradehavechanged.vue | 2 +- .../components/upgradetargetmodel.vue | 20 +++++++++++++------ .../vehicleinformation/components/other.vue | 1 + 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index fc745c5b1..ace445a90 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -243,6 +243,7 @@ export default { } this.record=record this.visible = true + this.confirmLoading = false this.formInline = {} this.formInline.dataList = [{}] this.$nextTick(() => { diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 4f004085a..39f523d9c 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -447,7 +447,7 @@ export default { this.$refs.upgradecompletionRef.addModel(record,flag) }, // 查看 - detailclick(){ + detailclick(record){ }, // 维护 diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 8f4b044d5..0b3f3fd80 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -23,6 +23,7 @@ :disabled="disabled" v-model="formInline.zsl" :title='formInline.zsl' + :max-length="50" :placeholder="$t('PleaseSelect')"> @@ -145,6 +146,7 @@ export default { this.formInline.dateofproduction=[] this.formInline.dateofproduction.push(res.result.scrqks) this.formInline.dateofproduction.push(res.result.scrqjs) + this.formInline.id = res.result.vinList this.$forceUpdate() } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 3a72352db..9f4830c36 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -57,7 +57,7 @@ - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index ab30dab77..fa99ca385 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -41,7 +41,7 @@
- +
@@ -52,7 +52,7 @@
- +
@@ -77,7 +77,7 @@ {{$t('producttrademark')}} - + @@ -88,7 +88,7 @@ {{$t('productname')}} - + @@ -99,7 +99,7 @@ {{$t('productModel')}} - + @@ -197,7 +197,15 @@ import ImportFile from '@/components/ImportFileData/index' } getAction('/ota/otaBaSjSjmbcx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code == 200){ - this.form=res.result ==null?{}:res.result + if(res.result==null){ + this.form=res.result + this.form.cxmb=undefined + this.form.bapc=undefined + this.form.dllx1=undefined + this.form.dllx2=undefined + }else{ + this.form=res.result + } } }) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index ec37b9bc7..dc0c50501 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -11,6 +11,7 @@ From 51e28e97374c72e73d165a0fde698772a5801efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 15:54:19 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B2=A1=E6=9C=89=E7=BB=93=E6=9D=9F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- .../views/projectManagement/components/listOfRegulations.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a112514e2..03b7480fb 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -619,7 +619,7 @@ module.exports = { Deliverables: 'Deliverables', personLiable: 'Assignee', PrehomoConfirmation: 'Pre-Homo Confirmation', - verificationAndConformityconfirmation: 'Validation Compliance Check ', + verificationAndConformityconfirmation: 'Validation Compliance Check', StandardImplementationDate: 'New Type Execution Date', regulatoryEngineer: 'Regulation Engineer', certifiedEngineer: 'Homo Engineer', diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 5c3de7460..b17221f55 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1305,7 +1305,7 @@ actiProcInstId: row.verifyPId, projectTaskInventoryId: row.id, projectLibraryId: row.projectLibraryId, - TaskKey: row.taskDefinitionKey, + TaskKey: TaskKey, flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', From f56574556f06e6f9aef34a17a5425c36f755e66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 15:54:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B2=A1=E6=9C=89=E7=BB=93=E6=9D=9F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/head/service/impl/HeadCustomEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index 56c09a81f..1863e9935 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -248,7 +248,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl