检验结论字段调整checkConclusion

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -4140,7 +4140,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             taskOrderItemReportDO.setPrepareJson(orderItemEnterVO.getPrepareJson());
             JSONObject jsonObject = JSONObject.parseObject(orderItemEnterVO.getPrepareJson());
             // 获取当前报告结论
-            taskOrderItemReportDO.setReportConclusion(jsonObject.getString("reportConclusion"));
+            taskOrderItemReportDO.setReportConclusion(jsonObject.getString("checkConclusion"));
             //记录每个报告的检查时间
             if (jsonObject.containsKey("enterDate")) {
                 Object enterDateObj = jsonObject.get("enterDate");
@@ -4236,7 +4236,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             taskOrderItemReportDO.setPrepareJson(orderItemEnterVO.getPrepareJson());
             JSONObject jsonObject = JSONObject.parseObject(orderItemEnterVO.getPrepareJson());
             // 获取当前报告结论
-            taskOrderItemReportDO.setReportConclusion(jsonObject.getString("reportConclusion"));
+            taskOrderItemReportDO.setReportConclusion(jsonObject.getString("checkConclusion"));
             //记录每个报告的检查时间
             if (jsonObject.containsKey("enterDate")) {
                 Object enterDateObj = jsonObject.get("enterDate");

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskordersecuritycheck/BoilerTaskOrderSecurityCheckServiceImpl.java

@@ -124,7 +124,7 @@ public class BoilerTaskOrderSecurityCheckServiceImpl implements BoilerTaskOrderS
             if(StringUtils.isNotBlank(createReqVO.getJsonData())){
                 Map map = objectMapper.readValue(createReqVO.getJsonData(), Map.class);
                 Object yxDateObj = map.get("yxDate");
-                Object reportConclusion = map.get("reportConclusion");
+                Object reportConclusion = map.get("checkConclusion");
                 if(yxDateObj != null && StringUtils.isNotBlank(yxDateObj.toString())){
                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
                     LocalDate localDate = LocalDate.parse(yxDateObj.toString(), formatter);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -3240,7 +3240,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             taskOrderItemReportDO.setPrepareJson(orderItemEnterVO.getPrepareJson());
             JSONObject jsonObject = JSONObject.parseObject(orderItemEnterVO.getPrepareJson());
             // 获取当前报告结论
-            taskOrderItemReportDO.setReportConclusion(jsonObject.getString("reportConclusion"));
+            taskOrderItemReportDO.setReportConclusion(jsonObject.getString("checkConclusion"));
             //记录每个报告的检查时间
             if (jsonObject.containsKey("enterDate")) {
                 Object enterDateObj = jsonObject.get("enterDate");

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -512,7 +512,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
 //                    equipPipeDO.setLastCheckAllowWorkPressure(map.get("lastCheckAllowWorkPressure"));
 //                    equipPipeDO.setLastCheckAllowWorkMedium(map.get("lastCheckAllowWorkMedium"));
 //                    equipPipeDO.setLastCheckAllowWorkTemperature(map.get("lastCheckAllowWorkTemperature"));
-//                    equipPipeDO.setLastCheckConclusion(map.get("reportConclusion"));
+//                    equipPipeDO.setLastCheckConclusion(map.get("checkConclusion"));
 //                    equipPipeDO.setLastCheckProblem(map.get("checkProblem"));
 //                    equipPipeDO.setLastCheckReportNo(lastCheckReportNo);
 
@@ -542,7 +542,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
 //                    equipPipeDO.setLastYearCheckConclusionPressure(map.get("lastYearCheckConclusionPressure"));
 //                    equipPipeDO.setLastYearCheckConclusionMedium(map.get("lastYearCheckConclusionMedium"));
 //                    equipPipeDO.setLastYearCheckConclusionTemperature(map.get("lastYearCheckConclusionTemperature"));
-//                    equipPipeDO.setLastYearCheckConclusion(map.get("reportConclusion"));
+//                    equipPipeDO.setLastYearCheckConclusion(map.get("checkConclusion"));
 //                    equipPipeDO.setLastYearCheckProblem(map.get("checkProblem"));
 //
 //                    equipPipeDO.setLastYearCheckReportNo(lastCheckReportNo);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskordersecuritycheck/PipeTaskOrderSecurityCheckServiceImpl.java

@@ -72,7 +72,7 @@ public class PipeTaskOrderSecurityCheckServiceImpl extends ServiceImpl<PipeTaskO
             if(StringUtils.isNotBlank(createReqVO.getJsonData())){
                 Map map = objectMapper.readValue(createReqVO.getJsonData(), Map.class);
                 Object yxDateObj = map.get("yxDate");
-                Object reportConclusion = map.get("reportConclusion");
+                Object reportConclusion = map.get("checkConclusion");
                 if(yxDateObj != null && StringUtils.isNotBlank(yxDateObj.toString())){
                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
                     LocalDate localDate = LocalDate.parse(yxDateObj.toString(), formatter);