办结回写数据

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -816,12 +816,12 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                     LocalDate nextInCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextInCheckDate"));
                     equipBoilerDO.setNextcheckdate(nextInCheckDate.atStartOfDay());
                 }
-                if (map.getString("nextOutCheckDate") != null) {
-                    LocalDate nextOutCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextOutCheckDate"));
-                    equipBoilerDO.setNextInCheckDate(nextOutCheckDate.atStartOfDay());
+                if (map.getString("sh3_custom_3") != null) {
+                    LocalDate nextInCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("sh3_custom_3"));
+                    equipBoilerDO.setNextInCheckDate(nextInCheckDate.atStartOfDay());
                 }
-                if (map.getString("nextPressureCheckDate") != null) {
-                    LocalDate nextPressureCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextPressureCheckDate"));
+                if (map.getString("nextInCheckDate1") != null) {
+                    LocalDate nextPressureCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextInCheckDate1"));
                     equipBoilerDO.setNextInCheckDate(nextPressureCheckDate.atStartOfDay());
                 }
                 if (map.getString("checkResult") != null) {
@@ -841,6 +841,14 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                     LocalDate nextOutCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextOutCheckDate"));
                     equipBoilerDO.setNextOutCheckDate(nextOutCheckDate.atStartOfDay());
                 }
+                if (map.getString("sh2_val_12") != null) {
+                    LocalDate nextOutCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("sh2_val_12"));
+                    equipBoilerDO.setNextOutCheckDate(nextOutCheckDate.atStartOfDay());
+                }
+                if (map.getString("nextOutCheckDate1") != null) {
+                    LocalDate nextOutCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextOutCheckDate1"));
+                    equipBoilerDO.setNextOutCheckDate(nextOutCheckDate.atStartOfDay());
+                }
                 if (map.getString("checkResult") != null) {
                     equipBoilerDO.setLastOutCheckConclusion(map.getString("checkResult"));
                 }
@@ -854,8 +862,8 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                 // 耐压检
                 equipBoilerDO.setHasPressure(false);
 
-                if (map.getString("nextPressureCheckDate") != null) {
-                    LocalDate nextPressureCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextPressureCheckDate"));
+                if (map.getString("nextDate") != null) {
+                    LocalDate nextPressureCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextDate"));
                     equipBoilerDO.setNextPressureCheckDate(nextPressureCheckDate.atStartOfDay());
                 }
                 if (map.getString("checkResult") != null) {