|
|
@@ -881,15 +881,21 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
|
|
|
//
|
|
|
if (map.getString("nextInCheckDate") != null) {
|
|
|
LocalDate nextInCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextInCheckDate"));
|
|
|
- equipBoilerDO.setNextcheckdate(nextInCheckDate.atStartOfDay());
|
|
|
+ if (nextInCheckDate != null) {
|
|
|
+ equipBoilerDO.setNextcheckdate(nextInCheckDate.atStartOfDay());
|
|
|
+ }
|
|
|
}
|
|
|
if (map.getString("sh3_custom_3") != null) {
|
|
|
LocalDate nextInCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("sh3_custom_3"));
|
|
|
- equipBoilerDO.setNextInCheckDate(nextInCheckDate.atStartOfDay());
|
|
|
+ if (nextInCheckDate != null) {
|
|
|
+ equipBoilerDO.setNextInCheckDate(nextInCheckDate.atStartOfDay());
|
|
|
+ }
|
|
|
}
|
|
|
if (map.getString("nextInCheckDate1") != null) {
|
|
|
LocalDate nextPressureCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextInCheckDate1"));
|
|
|
- equipBoilerDO.setNextInCheckDate(nextPressureCheckDate.atStartOfDay());
|
|
|
+ if (nextPressureCheckDate != null) {
|
|
|
+ equipBoilerDO.setNextInCheckDate(nextPressureCheckDate.atStartOfDay());
|
|
|
+ }
|
|
|
}
|
|
|
if (map.getString("checkResult") != null) {
|
|
|
equipBoilerDO.setLastInCheckConclusion(map.getString("checkResult"));
|
|
|
@@ -906,15 +912,21 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
|
|
|
|
|
|
if (map.getString("nextOutCheckDate") != null) {
|
|
|
LocalDate nextOutCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextOutCheckDate"));
|
|
|
- equipBoilerDO.setNextOutCheckDate(nextOutCheckDate.atStartOfDay());
|
|
|
+ if (nextOutCheckDate != null) {
|
|
|
+ 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 (nextOutCheckDate != null) {
|
|
|
+ equipBoilerDO.setNextOutCheckDate(nextOutCheckDate.atStartOfDay());
|
|
|
+ }
|
|
|
}
|
|
|
if (map.getString("nextOutCheckDate1") != null) {
|
|
|
LocalDate nextOutCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextOutCheckDate1"));
|
|
|
- equipBoilerDO.setNextOutCheckDate(nextOutCheckDate.atStartOfDay());
|
|
|
+ if (nextOutCheckDate != null) {
|
|
|
+ equipBoilerDO.setNextOutCheckDate(nextOutCheckDate.atStartOfDay());
|
|
|
+ }
|
|
|
}
|
|
|
if (map.getString("checkResult") != null) {
|
|
|
equipBoilerDO.setLastOutCheckConclusion(map.getString("checkResult"));
|
|
|
@@ -931,7 +943,9 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
|
|
|
|
|
|
if (map.getString("nextDate") != null) {
|
|
|
LocalDate nextPressureCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextDate"));
|
|
|
- equipBoilerDO.setNextPressureCheckDate(nextPressureCheckDate.atStartOfDay());
|
|
|
+ if (nextPressureCheckDate != null) {
|
|
|
+ equipBoilerDO.setNextPressureCheckDate(nextPressureCheckDate.atStartOfDay());
|
|
|
+ }
|
|
|
}
|
|
|
if (map.getString("checkResult") != null) {
|
|
|
equipBoilerDO.setLastPressureCheckConclusion(map.getString("checkResult"));
|