From b6a9e2d91892b2be580b59f945f3d92f9588ec98 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 11 Aug 2022 17:10:44 +0800 Subject: [PATCH] =?UTF-8?q?57742=E5=A4=84=E7=90=86=EF=BC=8C=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7=E7=9C=8B=E6=9D=BF=EF=BC=8C?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E3=80=81=E5=AF=BC=E5=87=BA=E3=80=81=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA=E7=9B=B8=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=20"=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/LawsComplianceBoardMapper.xml | 3 +++ .../impl/LawsComplianceBoardServiceImpl.java | 27 ++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml index ded62bf91..37cf72f37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml @@ -37,10 +37,13 @@ pni.project_name as "projectName", pyni.year_name as "yearName", pti.design_status as "designStatus", + pti.design_flow_task_status as "designFlowTaskStatus", pti.design_p_id as "designPId", pti.prehomo_status as "prehomoStatus", + pti.prehomo_flow_task_status as "prehomoFlowTaskStatus", pti.prehomo_p_id as "prehomoPId", pti.verify_status as "verifyStatus", + pti.verify_flow_task_status as "verifyFlowTaskStatus", pti.verify_p_id as "verifyPId", pli.duty_territory as "dutyTerritory" FROM diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java index d29882c06..fb4624c43 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java @@ -15,6 +15,7 @@ import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; import com.jero.modules.project.enums.DesignComplianceStatusEnum; +import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.project.mapper.LawsComplianceBoardMapper; import com.jero.modules.project.service.ILawsComplianceBoardService; import com.jero.modules.system.entity.SysCategory; @@ -172,6 +173,20 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("verifyStatus").toString(), cut); complianceResult.put("verifyStatus_dicText",textByValue); } + + if (complianceResult.get("designFlowTaskStatus") != null) { + String textByValue = ReviewResultEnum.getTextByValue(complianceResult.get("designFlowTaskStatus").toString(), cut); + complianceResult.put("designFlowTaskStatus_dicText",textByValue); + } + if (complianceResult.get("prehomoFlowTaskStatus") != null && complianceResult.get("prehomoFlowTaskStatus") != "") { + String textByValue = ReviewResultEnum.getTextByValue(complianceResult.get("prehomoFlowTaskStatus").toString(), cut); + complianceResult.put("prehomoFlowTaskStatus_dicText",textByValue); + } + if (complianceResult.get("verifyFlowTaskStatus") != null) { + String textByValue = ReviewResultEnum.getTextByValue(complianceResult.get("verifyFlowTaskStatus").toString(), cut); + complianceResult.put("verifyFlowTaskStatus_dicText",textByValue); + } + if (complianceResult.get("dutyTerritory") != null) { String dutyTerritory_dicText = ""; if (CutEnum.EN.getValue().equals(cut)) { @@ -297,9 +312,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi dataRow.createCell(4).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("dutyTerritory_dicText"))); String projectName = checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("projectName")) + "-" + checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("yearName")); dataRow.createCell(5).setCellValue(projectName); - dataRow.createCell(6).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("designStatus_dicText"))); - dataRow.createCell(7).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("prehomoStatus_dicText"))); - dataRow.createCell(8).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("verifyStatus_dicText"))); + dataRow.createCell(6).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("designFlowTaskStatus_dicText"))); + dataRow.createCell(7).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("prehomoFlowTaskStatus_dicText"))); + dataRow.createCell(8).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("verifyFlowTaskStatus_dicText"))); if(byStandIdComlianceResultSize > 1 && i != (byStandIdComlianceResultSize - 1)){ rowIndex ++; } @@ -389,9 +404,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi Row dataRow = sheet.createRow(rowIndex); dataRow.createCell(0).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("dutyTerritory_dicText"))); dataRow.createCell(1).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("projectName"))); - dataRow.createCell(2).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("designStatus_dicText"))); - dataRow.createCell(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoStatus_dicText"))); - dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyStatus_dicText"))); + dataRow.createCell(2).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("designFlowTaskStatus_dicText"))); + dataRow.createCell(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoFlowTaskStatus_dicText"))); + dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyFlowTaskStatus_dicText"))); rowIndex ++; } }