From b0a9d359d35f498458cae1c5583b65f332beeb56 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 21 Mar 2023 10:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E8=AE=BE=E8=AE=A1=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=B9=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/enums/ReviewResultEnum.java | 7 ++- .../DesignComplianceFlowNodeKeyEnum.java | 20 +++---- .../VerifyComplianceFlowNodeKeyEnum.java | 20 +++---- .../impl/ProcessHistoryEOServiceImpl.java | 52 ++++++++++++++++++- 4 files changed, 77 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java index 60d8a7486..9bb8aae4f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java @@ -13,7 +13,12 @@ public enum ReviewResultEnum { INCONFORMITY("不符合","Non-Compliance"), TO_TRACK("待追踪","To be tracked"), UNINVOLVED("不涉及","NA"), - TERMINATION_OF_TASK("任务终止","Termination of task") + TERMINATION_OF_TASK("任务终止","Termination of task"), + ACCEPTED("接受","Accepted"), + REJECTED("拒绝","Rejected"), + TRANSFER("转办","Transfer"), + RETURNED("退回","Returned"), + ADOPT("通过","Adopt"), ; 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 index 9c097b85a..8c21a7240 100644 --- 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 @@ -7,12 +7,12 @@ 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"), // 法规工程师审核 + 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; @@ -51,12 +51,12 @@ public enum DesignComplianceFlowNodeKeyEnum { public static String getTextByValue(String value,String cut) { DesignComplianceFlowNodeKeyEnum[] values = values(); - for (DesignComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) { - if (todoCenterStatusEnum.value.equals(value)) { + for (DesignComplianceFlowNodeKeyEnum designComplianceFlowNodeKeyEnum : values) { + if (designComplianceFlowNodeKeyEnum.value.equals(value)) { if(StringUtils.equals(cut, CutEnum.CN.getValue())){ - return todoCenterStatusEnum.cnName; + return designComplianceFlowNodeKeyEnum.cnName; }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - return todoCenterStatusEnum.enName; + return designComplianceFlowNodeKeyEnum.enName; } } } 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 index cf0f3d4b1..7c301023b 100644 --- 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 @@ -7,12 +7,12 @@ 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"), // 法规工程师审核 + 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; @@ -51,12 +51,12 @@ public enum VerifyComplianceFlowNodeKeyEnum { public static String getTextByValue(String value,String cut) { VerifyComplianceFlowNodeKeyEnum[] values = values(); - for (VerifyComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) { - if (todoCenterStatusEnum.value.equals(value)) { + for (VerifyComplianceFlowNodeKeyEnum verifyComplianceFlowNodeKeyEnum : values) { + if (verifyComplianceFlowNodeKeyEnum.value.equals(value)) { if(StringUtils.equals(cut, CutEnum.CN.getValue())){ - return todoCenterStatusEnum.cnName; + return verifyComplianceFlowNodeKeyEnum.cnName; }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - return todoCenterStatusEnum.enName; + return verifyComplianceFlowNodeKeyEnum.enName; } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java index 1ffbcbec0..fc9f17943 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java @@ -5,13 +5,20 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.todoCenter.entity.ProcessInfoEO; +import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum; +import com.jero.modules.todoCenter.enums.VerifyComplianceFlowNodeKeyEnum; +import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.entity.ProcessHistoryEO; import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; +import com.jero.modules.wkflow.enums.FlowTypeEnum; import com.jero.modules.wkflow.mapper.ProcessHistoryEOMapper; import com.jero.modules.wkflow.service.IProcessHistoryEOService; import org.apache.commons.collections4.CollectionUtils; @@ -38,6 +45,10 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl actiProcInstIdList = datas.stream().map(ProcessHistoryEO::getActiProcInstId).distinct().collect(Collectors.toList()); + QueryWrapper processInfoEOQueryWrap = new QueryWrapper<>(); + processInfoEOQueryWrap.lambda().in(ProcessInfoEO::getActiProcInstId,actiProcInstIdList); + List processInfoList = this.processInfoEOService.list(processInfoEOQueryWrap); + + String approvalFiles = datas.stream().map(ProcessHistoryEO::getApprovalFile).distinct().collect(Collectors.joining(",")); + List approvalFileList = this.ossFileService.getFileInfos(approvalFiles); + for (ProcessHistoryEO data : datas) { if(StringUtils.isNotEmpty(data.getOperatorResult())){ data.setReviewResult(ReviewResultEnum.getTextByValue(data.getOperatorResult(),cut)); @@ -149,9 +168,40 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl sysUser.getId().equals(data.getOperatorPersonId())).collect(Collectors.toList()).get(0); data.setAssignee(userInfo.getUsername()); } - if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){ + List processInfoListTemp = processInfoList.stream().filter(processInfo -> { + boolean flag = false; + if (StringUtils.equals(processInfo.getActiProcInstId(), data.getActiProcInstId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(processInfoListTemp)){ + String flowType = processInfoListTemp.get(0).getFlowType(); + if(StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())){ + data.setName(DesignComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(),cut)); + }else if(StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())){ + data.setName(VerifyComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(),cut)); + }else if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){ + data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut)); + } + }else if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){ data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut)); } + + if(StringUtils.isNotEmpty(data.getApprovalFile())){ + if(CollectionUtils.isNotEmpty(approvalFileList)){ + String approvalFileNames = approvalFileList.stream().filter(file -> { + boolean flag = false; + if (StringUtils.contains(data.getApprovalFile(), file.getId())) { + flag = true; + } + return flag; + }).map(OSSFile::getFileName).collect(Collectors.joining(",")); + + data.setApprovalFileName(approvalFileNames); + } + } } } }