From 0093e118cd7b1367c9b4a1e2d966029d48ecfab3 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 20 Mar 2023 13:40:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B5=81=E7=A8=8B=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectLawsInventoryEO.java | 8 +++ .../enums/ComplianceFlowStatusEnum.java | 4 ++ .../IProjectLawsInventoryEOService.java | 10 +++ .../ProjectLawsInventoryEOServiceImpl.java | 21 ++++++ .../DesignComplianceFlowNodeKeyEnum.java | 65 +++++++++++++++++++ .../VerifyComplianceFlowNodeKeyEnum.java | 65 +++++++++++++++++++ .../impl/ProcessInfoEOServiceImpl.java | 36 ++++++++++ .../modules/todoCenter/vo/ProcessInfoVO.java | 5 ++ 8 files changed, 214 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index def122c18..267fac61b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -495,4 +495,12 @@ public class ProjectLawsInventoryEO implements Serializable { private String verifyFlowStatus; @TableField(exist = false) private String verifyFlowStatusName; + + /**验证符合性确认-流程实例id*/ + @TableField(exist = false) + private String verifyPId; + + /**设计符合性确认-流程实例id*/ + @TableField(exist = false) + private String designPId; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java index 25b712ff2..b47461102 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java @@ -12,6 +12,10 @@ public enum ComplianceFlowStatusEnum { TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), + CONFORMITY("符合","Compliance","Compliance"), + INCONFORMITY("不符合","Non-Compliance","Non-Compliance"), + TO_TRACK("待追踪","To be tracked","To be tracked"), + UNINVOLVED("不涉及","NA","NA") ; 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 859ac9661..88bb14dae 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 @@ -9,6 +9,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.vo.ProjectTaskUrgVo; +import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysRole; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; @@ -182,4 +183,13 @@ public interface IProjectLawsInventoryEOService extends IService regulationOwnerReturned(JSONObject json); + + /** + * 根据id获取交付物类型展示名称 + * @param projectLawsInventoryId + * @param cut + * @param flowType + * @return + */ + String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType,List projectLawsInventoryEOList,List categoryList); } 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 f2410492e..bd8164590 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 @@ -5727,6 +5727,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); @@ -10059,5 +10061,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList,List categoryList) { + String result = ""; + + for (ProjectLawsInventoryEO lawsInventory : projectLawsInventoryEOList) { + if(StringUtils.equals(projectLawsInventoryId,lawsInventory.getId())){ + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + List designDeliverableTypeList = Arrays.asList(lawsInventory.getDesignDeliverableType().split(",")); + result = this.getTreeName(cut, categoryList, designDeliverableTypeList); + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + lawsInventory.getVerifyDeliverableType(); + List verifyDeliverableTypeList = Arrays.asList(lawsInventory.getVerifyDeliverableType().split(",")); + result = this.getTreeName(cut, categoryList, verifyDeliverableTypeList); + } + } + } + return result; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java new file mode 100644 index 000000000..9c097b85a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java @@ -0,0 +1,65 @@ +package com.jero.modules.todoCenter.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 待办中心-设计符合性流程节点key枚举类 + */ +public enum DesignComplianceFlowNodeKeyEnum { + fqlc("发起流程","Initiate the process","fqlc"), + zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 + dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 + zrrtjjfw("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + dezrrtjjfw("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + fggcssh("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核 + ; + + String cnName; + String enName; + String value; + + private DesignComplianceFlowNodeKeyEnum(String cnName, String enName, String value) { + this.cnName = cnName; + this.enName = enName; + this.value = value; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + DesignComplianceFlowNodeKeyEnum[] values = values(); + for (DesignComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) { + if (todoCenterStatusEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return todoCenterStatusEnum.cnName; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return todoCenterStatusEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java new file mode 100644 index 000000000..cf0f3d4b1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java @@ -0,0 +1,65 @@ +package com.jero.modules.todoCenter.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 待办中心-验证符合性流程节点key枚举类 + */ +public enum VerifyComplianceFlowNodeKeyEnum { + fqlc("发起流程","Initiate the process","fqlc"), + zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 + dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 + zrrtjjfw("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + dezrrtjjfw("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + fggcssh("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核 + ; + + String cnName; + String enName; + String value; + + private VerifyComplianceFlowNodeKeyEnum(String cnName, String enName, String value) { + this.cnName = cnName; + this.enName = enName; + this.value = value; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + VerifyComplianceFlowNodeKeyEnum[] values = values(); + for (VerifyComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) { + if (todoCenterStatusEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return todoCenterStatusEnum.cnName; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return todoCenterStatusEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index 6549e3e92..6f56545ad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -24,13 +24,17 @@ import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; +import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; +import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum; import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; +import com.jero.modules.todoCenter.enums.VerifyComplianceFlowNodeKeyEnum; import com.jero.modules.todoCenter.mapper.ProcessInfoEOMapper; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; @@ -86,6 +90,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl createByUserList = this.sysUserService.querySysUserListByIdList(createByUserIdList); LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List projectLawsInventoryIdList = datas.stream().filter(data -> { + boolean flag = false; + if (StringUtils.isNotEmpty(data.getProjectLawsInventoryId())) { + flag = true; + } + return flag; + }).map(ProcessInfoVO::getProjectLawsInventoryId).collect(Collectors.toList()); + + List projectLawsInventoryEOList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){ + QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); + lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); + projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrapper); + } + List categoryList = sysCategoryService.list(); + for (ProcessInfoVO data : datas) { + // 处理展示的交付物类型信息 + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + String projectLawsInventoryId = data.getProjectLawsInventoryId(); + String deliverableTypeName = this.projectLawsInventoryEOService.getDeliverableTypeNameById(projectLawsInventoryId,cut,data.getFlowType(),projectLawsInventoryEOList,categoryList); + data.setDeliverableTypeName(deliverableTypeName); + } + } datas.forEach(data -> { // 设置发起人的名称 if(CollectionUtils.isNotEmpty(createByUserList) && StringUtils.isNotEmpty(data.getCreateBy())){ @@ -620,6 +649,13 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl