diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java index e07b4c2d9..858e0e1c2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java @@ -73,4 +73,8 @@ public enum ProjectRoleEnum { } return null; } + + public int getIntValue() { + return Integer.valueOf(value); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java index 79aed2732..66497e08d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java @@ -116,11 +116,13 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl updateList = paramsCollectManifestEOList.stream() - .filter(e-> !CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList()); + .filter(e -> (!CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) + && !CollectManifestStateEnum.CHANGE.getValue().equals(e.getState()))) + .collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(updateList)) { List updateCollectManifestEOList = new ArrayList<>(); updateList.forEach(collectManifestEO -> { - ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); + ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); updateCollectManifestEO.setId(collectManifestEO.getId()); updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue()); updateCollectManifestEOList.add(updateCollectManifestEO); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 1f2dfcac3..050b2fb3f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -596,7 +596,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl certificationQueryWrap = new QueryWrapper<>(); certificationQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId()); List oldPciEoList = this.list(certificationQueryWrap); - if(projectCertificationInventoryEO.getEndTime() != null){ - // 编辑截至日期处理逻辑 - this.editEndTime(projectCertificationInventoryEO, oldPciEoList); + if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())) { + // 编辑工程接口人处理逻辑 + this.editSdt(projectCertificationInventoryEO, oldPciEoList, currentUser); } - if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())){ + if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())) { // 编辑责任人处理逻辑 - this.editDutyPerson(projectCertificationInventoryEO,oldPciEoList); + this.editDutyPerson(projectCertificationInventoryEO, oldPciEoList, currentUser); } - if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableType()) || StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableTemplate())){ - // 编辑交付物类型、交付物模板逻辑 - // TODO 此处逻辑需要详细需求。如何操作。 + if (projectCertificationInventoryEO.getEndTime() != null) { + // 编辑截至日期处理逻辑 + this.editEndTime(projectCertificationInventoryEO, oldPciEoList, currentUser); + } + if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableType())) { + // 编辑交付物类型逻辑 + this.editDeliverableType(projectCertificationInventoryEO, oldPciEoList, currentUser); + } + if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableTemplate())) { + // 编辑交付物模板逻辑 + this.editDeliverableTemplate(projectCertificationInventoryEO, oldPciEoList, currentUser); + } // 获取编辑前的数据 @@ -247,8 +258,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); params.put("projectLibraryId",projectId); params.put("userId",currentUser.getId()); @@ -396,11 +405,213 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl oldPciEoList, LoginUser currentUser) { + String newDeliverableTemplate = newPciEo.getDeliverableTemplate(); + List oldPciEos = oldPciEoList.stream().filter(pldPciEo -> { + boolean flag = ( + !newDeliverableTemplate.equals(pldPciEo.getDeliverableTemplate()) + && ( + StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) + ) + ); + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(oldPciEos)){ + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId()); + for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { + String msgTitleCn = ""; + String msgTitleEn = ""; + String taskDefinitionKey = ""; + if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { + msgTitleCn = ProjectMessageEnum.RZRWQR.getCnName(); + msgTitleEn = ProjectMessageEnum.RZRWQR.getEnName(); + taskDefinitionKey = CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(); + }else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())) { + msgTitleCn = ProjectMessageEnum.PREHOMEQR.getCnName(); + msgTitleEn = ProjectMessageEnum.PREHOMEQR.getEnName(); + taskDefinitionKey = CertificationFlowNodeEnum.TASK_HANDLING.getKey(); + } + List userIdList = new ArrayList<>(); + userIdList.add(oldPciEo.getDutyPerson()); + if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){ + userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","))); + } + List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + oldPciEo.setEndTime(newPciEo.getEndTime()); + List PciEoList = new ArrayList<>(); + PciEoList.add(oldPciEo); + this.sendMessageByTemplateId( + PciEoList, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + oldPciEo.getEndTime(), + taskDefinitionKey, + msgTitleCn, + msgTitleEn, + ProjectMessageEnum.RZRWJFWMBBXG.getCnName(), + ProjectMessageEnum.RZRWJFWMBBXG.getEnName() + ); + } + } + } + } + + private void editDeliverableType(ProjectCertificationInventoryEO newPciEo, List oldPciEoList, LoginUser currentUser) { + String newDeliverableType = newPciEo.getDeliverableType(); + List oldPciEos = oldPciEoList.stream().filter(pldPciEo -> { + boolean flag = ( + !newDeliverableType.equals(pldPciEo.getDeliverableType()) + && ( + StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) + ) + ); + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(oldPciEos)){ + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); + if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId()); + for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { + String msgTitleCn = ""; + String msgTitleEn = ""; + String taskDefinitionKey = ""; + if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { + msgTitleCn = ProjectMessageEnum.RZRWQR.getCnName(); + msgTitleEn = ProjectMessageEnum.RZRWQR.getEnName(); + taskDefinitionKey = CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(); + }else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())) { + msgTitleCn = ProjectMessageEnum.PREHOMEQR.getCnName(); + msgTitleEn = ProjectMessageEnum.PREHOMEQR.getEnName(); + taskDefinitionKey = CertificationFlowNodeEnum.TASK_HANDLING.getKey(); + } + List userIdList = new ArrayList<>(); + userIdList.add(oldPciEo.getDutyPerson()); + if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){ + userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","))); + } + List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + oldPciEo.setEndTime(newPciEo.getEndTime()); + List PciEoList = new ArrayList<>(); + PciEoList.add(oldPciEo); + this.sendMessageByTemplateId( + PciEoList, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + oldPciEo.getEndTime(), + taskDefinitionKey, + msgTitleCn, + msgTitleEn, + ProjectMessageEnum.RZRWJFWLXBXG.getCnName(), + ProjectMessageEnum.RZRWJFWLXBXG.getEnName() + ); + } + } + } + } + + /** + * 编辑工程接口人处理逻辑 + */ + private void editSdt(ProjectCertificationInventoryEO pciEo, List oldPciEoList,LoginUser currentUser) { + // 过滤出来,旧数据的接口人与新修改的接口人不是同一个人 + List oldPciEos = oldPciEoList.stream().filter(oldPciEo -> { + boolean flag = ( + !StringUtils.equals(oldPciEo.getDutyPerson(), pciEo.getDutyPerson()) + && ( + StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) + ) + ); + return flag; + }).collect(Collectors.toList()); + for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { + List userIdList = new ArrayList<>(); + userIdList.add(oldPciEo.getSdt()); + List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + + List PciEoList = new ArrayList<>(); + PciEoList.add(oldPciEo); + if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { + this.sendMessageByTemplateId( + PciEoList, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + pciEo.getEndTime(), + CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(), + ProjectMessageEnum.RZRWQR.getCnName(), + ProjectMessageEnum.RZRWQR.getEnName(), + ProjectMessageEnum.RWBFQRCH.getCnName(), + ProjectMessageEnum.RWBFQRCH.getEnName() + ); + }else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){ + this.sendMessageByTemplateId( + PciEoList, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + pciEo.getEndTime(), + CertificationFlowNodeEnum.TASK_HANDLING.getKey(), + ProjectMessageEnum.PREHOMEQR.getCnName(), + ProjectMessageEnum.PREHOMEQR.getEnName(), + ProjectMessageEnum.RWBFQRCH.getCnName(), + ProjectMessageEnum.RWBFQRCH.getEnName() + ); + } + } + if (CollectionUtils.isNotEmpty(oldPciEos)) { + List userIdList = oldPciEos.stream().map(ProjectCertificationInventoryEO::getSdt).distinct().collect(Collectors.toList()); + List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + if (StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { + this.sendMessageByTemplateId( + oldPciEos, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + pciEo.getEndTime(), + CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(), + ProjectMessageEnum.RZRWQR.getCnName(), + ProjectMessageEnum.RZRWQR.getEnName(), + ProjectMessageEnum.RZQRRWYQ.getCnName(), + ProjectMessageEnum.RZQRRWYQ.getEnName() + ); + }else if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){ + this.sendMessageByTemplateId( + oldPciEos, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + pciEo.getEndTime(), + CertificationFlowNodeEnum.TASK_HANDLING.getKey(), + ProjectMessageEnum.PREHOMEQR.getCnName(), + ProjectMessageEnum.PREHOMEQR.getEnName(), + ProjectMessageEnum.RZQRRWYQ.getCnName(), + ProjectMessageEnum.RZQRRWYQ.getEnName() + ); + } + } + } + /** * 编辑责任人处理逻辑 * @param pciEo */ - private void editDutyPerson(ProjectCertificationInventoryEO pciEo,List oldPciEoList) { + private void editDutyPerson(ProjectCertificationInventoryEO pciEo,List oldPciEoList,LoginUser currentUser) { // 过滤出来,旧数据的责任人与新修改的责任人不是同一个人,并且流程状态是 任务待确认、结果待提交、审查退回的数据,这三个状态的流程数据在责任人节点。 List oldPciEos = oldPciEoList.stream().filter(oldPciEo -> { boolean flag = ( @@ -413,18 +624,72 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(oldPciEo.getDutyPerson()); + List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + List PciEoList = new ArrayList<>(); + PciEoList.add(oldPciEo); + if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { + this.sendMessageByTemplateId( + PciEoList, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + pciEo.getEndTime(), + CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(), + ProjectMessageEnum.RZRWQR.getCnName(), + ProjectMessageEnum.RZRWQR.getEnName(), + ProjectMessageEnum.RWBFQRCH.getCnName(), + ProjectMessageEnum.RWBFQRCH.getEnName() + ); + }else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){ + this.sendMessageByTemplateId( + PciEoList, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + pciEo.getEndTime(), + CertificationFlowNodeEnum.TASK_HANDLING.getKey(), + ProjectMessageEnum.PREHOMEQR.getCnName(), + ProjectMessageEnum.PREHOMEQR.getEnName(), + ProjectMessageEnum.RWBFQRCH.getCnName(), + ProjectMessageEnum.RWBFQRCH.getEnName() + ); + } + } if (CollectionUtils.isNotEmpty(oldPciEos)) { List userIdList = oldPciEos.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); - this.sendMessageByTemplateId( - oldPciEos, - TemplateInfoEnum2.CERTIFICATION_MESSAGE15.getValue(), - userIdList, - userInfoList, - pciEo.getEndTime(), - "" - ); + if (StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { + this.sendMessageByTemplateId( + oldPciEos, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + pciEo.getEndTime(), + CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(), + ProjectMessageEnum.RZRWQR.getCnName(), + ProjectMessageEnum.RZRWQR.getEnName(), + ProjectMessageEnum.RZQRRWYQ.getCnName(), + ProjectMessageEnum.RZQRRWYQ.getEnName() + ); + }else if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){ + this.sendMessageByTemplateId( + oldPciEos, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + pciEo.getEndTime(), + CertificationFlowNodeEnum.TASK_HANDLING.getKey(), + ProjectMessageEnum.PREHOMEQR.getCnName(), + ProjectMessageEnum.PREHOMEQR.getEnName(), + ProjectMessageEnum.RZQRRWYQ.getCnName(), + ProjectMessageEnum.RZQRRWYQ.getEnName() + ); + } // 如果责任人有变更,将之前责任人的待办中心任务,移交给新的责任人。 QueryWrapper detailQueryWrap = new QueryWrapper<>(); @@ -452,7 +717,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl oldPciEoList) { + private void editEndTime(ProjectCertificationInventoryEO newPciEo, List oldPciEoList,LoginUser currentUser) { Date newEndTime = newPciEo.getEndTime(); // 过滤出来,旧的截止日期不等于更改后的新截止日期,并且数据状态为 任务待确认、结果待提交、审查退回的数据。 List oldPciEos = oldPciEoList.stream().filter(pldPciEo -> { @@ -468,23 +733,49 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); - List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); - - oldPciEos.get(0).setEndTime(newPciEo.getEndTime()); - this.sendMessageByTemplateId( - oldPciEos, - TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(), - userIdList, - userInfoList, - newEndTime, - "" - ); + // 同步更新待办中心-流程明细截止日期 + this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos); + int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId()); + for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { + String msgTitleCn = ""; + String msgTitleEn = ""; + String taskDefinitionKey = ""; + if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { + msgTitleCn = ProjectMessageEnum.RZRWQR.getCnName(); + msgTitleEn = ProjectMessageEnum.RZRWQR.getEnName(); + taskDefinitionKey = CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(); + }else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())) { + msgTitleCn = ProjectMessageEnum.PREHOMEQR.getCnName(); + msgTitleEn = ProjectMessageEnum.PREHOMEQR.getEnName(); + taskDefinitionKey = CertificationFlowNodeEnum.TASK_HANDLING.getKey(); + } + List userIdList = new ArrayList<>(); + userIdList.add(oldPciEo.getDutyPerson()); + if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){ + userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","))); + }else if(role == ProjectRoleEnum.HOMOLOGATION_ENGINEER.getIntValue()){ + userIdList.add(projectLibraryBase.getStudioEngineer()); + } + List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + oldPciEo.setEndTime(newPciEo.getEndTime()); + List PciEoList = new ArrayList<>(); + PciEoList.add(oldPciEo); + this.sendMessageByTemplateId( + PciEoList, + TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(), + userIdList, + userInfoList, + oldPciEo.getEndTime(), + taskDefinitionKey, + msgTitleCn, + msgTitleEn, + ProjectMessageEnum.RZRWJZSJBXG.getCnName(), + ProjectMessageEnum.RZRWJZSJBXG.getEnName() + ); + } } } } @@ -605,6 +896,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl setBatch(ProjectCertificationInventoryEO projectCertificationInventoryEO) { + //获取当前用户 + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String ids = projectCertificationInventoryEO.getIds(); if(StringUtils.isEmpty(ids)){ throw new JeroBootException("至少选择一条数据进行批量设置!"); @@ -647,18 +940,25 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl flowStatusList = new ArrayList<>(); @@ -728,8 +1028,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryEOS, @@ -738,6 +1036,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userInfoList, Date endTime, String taskDefinitionKey){ + this.sendMessageByTemplateId(projectCertificationInventoryEOS,templeteId,userIdList,userInfoList,endTime,taskDefinitionKey,"","","",""); + } + + /** + * 根据模板发送消息(可发送公共消息) + */ + private void sendMessageByTemplateId(List projectCertificationInventoryEOS, + String templeteId, + List userIdList, + List userInfoList, + Date endTime, + String taskDefinitionKey, + String msgTitleCn, + String msgTitleEn, + String contentCn, + String contentEn){ LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId()); @@ -772,6 +1086,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl templateVariableMap = new HashMap<>(); + if(StringUtils.isNotEmpty(msgTitleCn)){ + templateVariableMap.put("msgTitleCn",msgTitleCn); + } + if(StringUtils.isNotEmpty(msgTitleEn)){ + templateVariableMap.put("msgTitleEn",msgTitleEn); + } + if(StringUtils.isNotEmpty(contentCn)){ + templateVariableMap.put("contentCn",contentCn); + } + if(StringUtils.isNotEmpty(contentEn)){ + templateVariableMap.put("contentEn",contentEn); + } templateVariableMap.put("projectNameCn",PRN_CN); templateVariableMap.put("projectNameEn",PRN_EN); templateVariableMap.put("standName",standName); @@ -6323,6 +6649,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> replacementUserList = (List>) json.get("replacementUserList"); @@ -6348,7 +6676,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl oldPciEoList = this.list(certificationQueryWrap); List oldPciEoList = pciEoList.stream().filter(p -> StringUtils.equals(p.getId(),pciEo.getId())).distinct().collect(Collectors.toList()); // 编辑责任人处理逻辑 - this.editDutyPerson(newPciEo, oldPciEoList); + this.editDutyPerson(newPciEo, oldPciEoList,currentUser); pciEo.setDutyPerson(newUserId); } 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 352e1fac6..238c781b6 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 @@ -9293,17 +9293,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl \ No newline at end of file diff --git a/jero-web/src/views/phoneView/problemKnowledgeBase.vue b/jero-web/src/views/phoneView/problemKnowledgeBase.vue index 71064cc97..09a410350 100644 --- a/jero-web/src/views/phoneView/problemKnowledgeBase.vue +++ b/jero-web/src/views/phoneView/problemKnowledgeBase.vue @@ -458,7 +458,7 @@ display: flex; position: sticky; top: 0; - padding-top: 0.4rem; + padding-top: 10px; background: #fff; z-index: 1000; } @@ -469,7 +469,7 @@ } .header-search-text { - font-size: 0.44rem; + font-size: 16px; font-family: PingFang SC-Medium, PingFang SC; font-weight: 600; color: #040B29; diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue index 9f072c414..5b8176410 100644 --- a/jero-web/src/views/phoneView/processManagement.vue +++ b/jero-web/src/views/phoneView/processManagement.vue @@ -355,7 +355,9 @@ } }) } else { - this.$router.go(-1) + this.$router.push({ + path: '/phoneToDoCenter', + }) } }, onSubmit() { @@ -570,7 +572,9 @@ } }) } else { - this.$router.go(-1) + this.$router.push({ + path: '/phoneToDoCenter', + }) } } else { this.show = false diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 2409c227d..a76a38c4e 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -267,12 +267,12 @@ {{$t('dataExport')}} -
+
{{$t('referenceparameter')}}
-
+
{{$t('tempSave')}}
@@ -2097,7 +2097,7 @@ let selectedRowKeysValue = [] data.forEach(res => { if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' || - res.state == 'Rejected by homo engineer') { + res.state == 'Rejected by homo engineer' ||res.state == 'Modify' || res.state == '变更') { selectedRowKeysValue.push(res) } }) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 2e5448823..62c423b60 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -461,7 +461,7 @@ - +
+ +
+
+ {{ $t('statisticalNodes') }} +
+ + + + {{ item.key }} + + + +
+
@@ -320,6 +343,7 @@ }, queryParam: {}, orderByField: '', + firstLevelDutyTerritoryList:[], columns: [ { title: this.$t('category'), @@ -429,10 +453,20 @@ this.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false this.getList() + this.getFirstLevelDutyTerritory() }, computed: {}, methods: { ...mapGetters(['userInfo']), + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, onSelectChange(value) { this.selectedRowKeys = value },