Skip to content

A
amos-boot-biz
Commit f50245bf authored by tianyiming's avatar tianyiming
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents b483f57e 4df75923
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java
View file @ f50245bf
......@@ -758,7 +758,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
.setInspectionConclusion(Objects.toString(entryData.getOrDefault("inspectConclusion", "")))
.setInspectionDate(sdf.parse(entryData.get("inspectDate").toString()))
.setNextInspectionDate(sdf.parse(entryData.get("nextInspectionDate").toString()))
.setApplicationDate(sdf.parse(entryData.get("applicationDate").toString()))
.setApplicationDate(ObjectUtils.isEmpty(entryData.get("applicationDate")) ? null : sdf.parse(Objects.toString(entryData.get("applicationDate"))))
.setInspectionStartDate(null)
.setInspectionEndDate(null)
.setInspectionResultSummary(null)
......@@ -789,7 +789,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
// 保存到设备的检验信息表
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = new IdxBizJgInspectionDetectionInfo();
inspectionDetectionInfo.setInspectConclusion(Objects.toString(entryData.getOrDefault("inspectConclusion", "")));
inspectionDetectionInfo.setInspectDate(sdf.parse(entryData.get("applicationDate").toString()));
inspectionDetectionInfo.setInspectDate(ObjectUtils.isEmpty(entryData.get("applicationDate")) ? null : sdf.parse(Objects.toString(entryData.get("applicationDate"))));
inspectionDetectionInfo.setInspectReport(ObjectUtils.isEmpty(entryData.get("JYJC_TZSBJYBG")) ? null : JSON.toJSONString(entryData.get("JYJC_TZSBJYBG")));
inspectionDetectionInfo.setInspectOrgCode(Objects.toString(entryData.getOrDefault("inspectOrgCode", "")));
inspectionDetectionInfo.setInspectOrgName(Objects.toString(entryData.getOrDefault("inspectOrgName", "")));
......@@ -811,6 +811,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
inspectionHistory.setRecDate(new Date());
jyjcInspectionHistoryService.save(inspectionHistory);
} catch (Exception e) {
log.warn(e.getMessage());
throw new BadRequest("数据异常，请联系管理员！");
}
}
......@@ -881,7 +882,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
.setInspectionConclusion(Objects.toString(entryData.getOrDefault("inspectConclusion", "")))
.setInspectionDate(sdf.parse(entryData.get("inspectDate").toString()))
.setNextInspectionDate(sdf.parse(entryData.get("nextInspectionDate").toString()))
.setApplicationDate(sdf.parse(entryData.get("applicationDate").toString()))
.setApplicationDate(ObjectUtils.isEmpty(entryData.get("applicationDate")) ? null : sdf.parse(Objects.toString(entryData.get("applicationDate"))))
.setInspectionStartDate(null)
.setInspectionEndDate(null)
.setInspectionResultSummary(null)
......@@ -912,7 +913,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
// 保存到设备的检验信息表
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = new IdxBizJgInspectionDetectionInfo();
inspectionDetectionInfo.setInspectConclusion(Objects.toString(entryData.getOrDefault("inspectConclusion", "")));
inspectionDetectionInfo.setInspectDate(sdf.parse(entryData.get("applicationDate").toString()));
inspectionDetectionInfo.setInspectDate(ObjectUtils.isEmpty(entryData.get("applicationDate")) ? null : sdf.parse(Objects.toString(entryData.get("applicationDate"))));
inspectionDetectionInfo.setInspectReport(ObjectUtils.isEmpty(entryData.get("JYJC_TZSBJYBG")) ? null : JSON.toJSONString(entryData.get("JYJC_TZSBJYBG")));
inspectionDetectionInfo.setInspectOrgCode(Objects.toString(entryData.getOrDefault("inspectOrgCode", "")));
inspectionDetectionInfo.setInspectOrgName(Objects.toString(entryData.getOrDefault("inspectOrgName", "")));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment