Commit b838285c authored by caotao's avatar caotao

改造变更详情报错处理

parent a8feff0c
...@@ -410,16 +410,20 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -410,16 +410,20 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
} }
Map<String, Object> detail = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class); Map<String, Object> detail = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class);
Map<String, Object> originalData = new HashMap<>(); Map<String, Object> originalData = new HashMap<>();
Map<String, Object> originalDataOther = new HashMap<>();
if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) { if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) {
originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId); originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
originalDataOther = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
originalData.remove("sequenceNbr"); originalData.remove("sequenceNbr");
originalDataOther.remove("sequenceNbr");
if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) { if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString())); detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
} }
if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) { if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) {
detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString())); detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
} }
detail.putAll(originalDataOther);
detail.put("techInfo",originalData); detail.put("techInfo",originalData);
} else { } else {
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>() JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
......
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