From 2340fd2610e9f3d5f1e657cafb2f246a2991f234 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 1 Feb 2024 17:04:01 +0800 Subject: [PATCH] =?UTF-8?q?fix=2081363=20=E6=B3=95=E8=A7=84=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=83=A8?= =?UTF-8?q?=E6=89=80=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BF=AE=E6=94=B9=E6=98=AF=E5=90=A6=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E8=8A=82=E7=82=B9=E4=BE=9D=E7=84=B6=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/enums/YesOrNoEnum.java | 12 ++++++++++ .../entity/ProcessProjectStandardTerm.java | 7 ++++++ .../ProcessProjectStandardService.java | 23 +++++++++++++++---- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java index b51cb16a..25a409bd 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java @@ -13,6 +13,9 @@ import org.springframework.web.bind.annotation.GetMapping; @Getter @AllArgsConstructor public enum YesOrNoEnum { + /** + * + */ NO("否","0",0), YES("是","1",1); @@ -20,4 +23,13 @@ public enum YesOrNoEnum { String name; String value; Integer integer; + + public static String getNameByValue(String value) { + for (YesOrNoEnum enumObject : values()) { + if (enumObject.getValue().equals(value)) { + return enumObject.getName(); + } + } + return null; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java index d60a36f5..5e9d7f4c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java @@ -132,6 +132,13 @@ public class ProcessProjectStandardTerm { @ApiModelProperty(value="是否立项") private String projectApprovalFlag; + /** + * 是否立项 + */ + @TableField(exist = false) + @ApiModelProperty(value="是否立项") + private String projectApprovalFlag_dictText; + /** * 设计工程师 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index bae41fb7..192956c9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -133,6 +133,7 @@ public class ProcessProjectStandardService extends ServiceImpl processProjectStandardTermUserList = new ArrayList<>(); List processProjectStandardTermList = new ArrayList<>(); + List approvalList1 = new ArrayList<>(); //获取所有用户信息 List userList = sysBaseAPI.getAllUser(); Map userNameMap = new HashMap<>(); @@ -181,6 +182,9 @@ public class ProcessProjectStandardService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(ProcessProjectStandardTermApproval::getProcessId,processId); + approvalList1 = termApprovalService.list(wrapper1); break; //设计工程师补充工作令编号 case ProcessProjectStandardCommon.SJGCSBCGZLBH: @@ -195,6 +199,8 @@ public class ProcessProjectStandardService extends ServiceImpl dictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); Map assessResultsMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); + Map> termIdApprovalListMap = CollStreamUtil.groupByKey(approvalList1, ProcessProjectStandardTermApproval::getTermId); + //给条款中保存关联的信息 Map> termIdListMap = CollStreamUtil.groupByKey(termUserList, ProcessProjectStandardTermUser::getTermId); for (ProcessProjectStandardTerm term : processProjectStandardTermList) { @@ -243,12 +249,23 @@ public class ProcessProjectStandardService extends ServiceImpl termApprovalList = termIdApprovalListMap.get(termId); + for (ProcessProjectStandardTermApproval termApproval : termApprovalList) { + String projectApprovalFlag1 = termApproval.getProjectApprovalFlag(); + if (YesOrNoEnum.YES.getValue().equals(projectApprovalFlag1)){ + projectApprovalFlag = YesOrNoEnum.YES.getValue(); + break; + } + } + }else if (AssessCommon.NOT_COMPLIANT.equals(assessResults)) { projectApprovalFlag = YesOrNoEnum.YES.getValue(); }else { projectApprovalFlag = YesOrNoEnum.NO.getValue(); } term.setProjectApprovalFlag(projectApprovalFlag); + term.setProjectApprovalFlag_dictText(YesOrNoEnum.getNameByValue(projectApprovalFlag)); String modelSeries = term.getModelSeries(); term.setModelSeries_dictText(sysBaseAPI.translateByDictMap(modelSeriesDictMap,modelSeries)); @@ -270,9 +287,7 @@ public class ProcessProjectStandardService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(ProcessProjectStandardTermApproval::getTermId,termId); - List approvalList = termApprovalService.list(wrapper1); + List approvalList = termIdApprovalListMap.get(termId); for (ProcessProjectStandardTermApproval termApproval : approvalList) { String responsibleUnitLeader = termApproval.getResponsibleUnitLeader(); termApproval.setResponsibleUnitLeader(userNameMap.get(responsibleUnitLeader));