WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

57742处理，法规符合性看板，明细、导出、回显字段改为相对应的符合性流程 "任务状态"

Browse Source
This commit is contained in:
wangzhijiang
2022-08-11 17:10:44 +08:00
parent 9cc24924ec
commit b6a9e2d918
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
+3
View File
@@ -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
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java
+21 -6
View File
@@ -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 ++;
}
}