From ffb5b4ff0a67931968480fafefb08956d062e6f3 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 16:07:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ComplianceFlowStatusEnum.java | 2 + .../service/impl/NcrTrackServiceImpl.java | 56 ++++++++++++++++++- .../jero/modules/project/vo/NcrTrackVO.java | 19 ++----- 3 files changed, 62 insertions(+), 15 deletions(-) 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 1eb7e76cf..6949a4ebb 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 @@ -19,6 +19,8 @@ public enum ComplianceFlowStatusEnum { TO_TRACK("待追踪","To be tracked","To be tracked"), UNINVOLVED("不涉及","NA","NA"), TERMINATION_OF_TASK("任务终止","Termination of task","Termination of task"), + LAWS_INCONFORMITY("法规未符合项","Non-compliance of regulations","Non-compliance of regulations"), + LAWS_TO_TRACK("法规待追踪项","Regulations to track items","Regulations to track items"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 71e759ba1..3d55b978d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -11,6 +11,8 @@ import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; +import com.jero.modules.project.enums.ColourEnum; +import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.enums.DataEnum; import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.project.mapper.NcrTrackMapper; @@ -18,6 +20,7 @@ import com.jero.modules.project.service.INcrTrackService; import com.jero.modules.project.service.IProblemManagementEOService; import com.jero.modules.project.vo.NcrTrackInfoVO; import com.jero.modules.project.vo.NcrTrackVO; +import com.jero.modules.project.vo.ProblemManagementVO; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.DicCodeEnum; @@ -310,10 +313,27 @@ public class NcrTrackServiceImpl extends ServiceImpl for (NcrTrackVO trackVO : trackVOListTemp) { String problemType = trackVO.getProblemType(); trackVO.setTitle(trackVO.getFlowType()+problemType); - + trackVO.setCreateBy(trackVO.getDuty()); + if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) + || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ + if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); + }else{ + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); + } + trackVO.setProblemType(ColourEnum.RED.getName()); + } + if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) + ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ + if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); + }else{ + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); + } + trackVO.setProblemType(ColourEnum.YELLOW.getName()); + } } - if(!ncrTrackVOList.isEmpty()){ trackVOListTemp.addAll(ncrTrackVOList); } @@ -343,6 +363,38 @@ public class NcrTrackServiceImpl extends ServiceImpl } List ncrTrackVOList = new ArrayList<>(); for (ProblemManagementEO problemManagementEO : managementEOList) { + //相关文件连接 + if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){ + List list = new ArrayList<>(); + for (String fileLink : problemManagementEO.getFileLink().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setFileLink(fileLink); + list.add(problemManagementVO); + } + problemManagementEO.setFileLinkList(list); + } + + //审批证据连接 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidenceLink())){ + List list = new ArrayList<>(); + for (String approvalEvidenceLink : problemManagementEO.getApprovalEvidenceLink().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setApprovalEvidenceLink(approvalEvidenceLink); + list.add(problemManagementVO); + } + problemManagementEO.setApprovalEvidenceLinkList(list); + } + //进度追踪 + if(StringUtils.isNotBlank(problemManagementEO.getProgressTracking())){ + List list = new ArrayList<>(); + for (String progressTracking : problemManagementEO.getProgressTracking().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setProgressTracking(progressTracking); + list.add(problemManagementVO); + } + problemManagementEO.setProgressTrackingList(list); + } + NcrTrackVO ncrTrackVOTemp = new NcrTrackVO(); BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp); ncrTrackVOTemp.setUuid(ncrTrackVOTemp.getId()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index f737c7640..e52292cde 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -173,13 +173,14 @@ public class NcrTrackVO implements Serializable { // @ApiModelProperty(value = "问题类型") // private java.lang.String problemType; + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**ps_issue*/ - @Excel(name = "ps_issue", width = 15) @ApiModelProperty(value = "ps_issue") private java.lang.String psIssue; /**相关法规*/ - @Excel(name = "相关法规", width = 15) @ApiModelProperty(value = "相关法规") private java.lang.String lawsId; @@ -194,54 +195,46 @@ public class NcrTrackVO implements Serializable { // private java.lang.String dutyTerritory; /**问题状态*/ - @Excel(name = "*问题状态", width = 15,dicCode ="wen4_ti2_lei4_xing2") @ApiModelProperty(value = "问题状态") private java.lang.String problemState; /**描述和分析*/ - @Excel(name = "描述和分析", width = 15) @ApiModelProperty(value = "描述和分析") private java.lang.String description; /**相关文件链接*/ - @Excel(name = "相关文件链接", width = 15) @ApiModelProperty(value = "相关文件链接") private java.lang.String fileLink; /**相关文件*/ - @Excel(name = "相关文件", width = 15) @ApiModelProperty(value = "相关文件") private java.lang.String file; /**进度追踪*/ - @Excel(name = "进度追踪", width = 15) @ApiModelProperty(value = "进度追踪") private java.lang.String progressTracking; /**结论*/ - @Excel(name = "结论", width = 15) @ApiModelProperty(value = "结论") private java.lang.String conclusion; /**审批证据*/ - @Excel(name = "审批证据", width = 15) @ApiModelProperty(value = "审批证据") private java.lang.String approvalEvidence; /**审批证据链接*/ - @Excel(name = "审批证据链接", width = 15) @ApiModelProperty(value = "审批证据链接") private java.lang.String approvalEvidenceLink; @ApiModelProperty(value = "相关文件地址链接（前端传参）") - private List fileLinkList; + private List fileLinkList; @ApiModelProperty(value = "进度追踪（前端传参）") - private List progressTrackingList; + private List progressTrackingList; @ApiModelProperty(value = "审批证据链接（前端传参）") - private List approvalEvidenceLinkList; + private List approvalEvidenceLinkList; @ApiModelProperty(value = "相关法规中文名") private String lawsName;