Commit 16efe4f3 authored by 刘林's avatar 刘林

fix(jg):使用单位发起超设计使用年限变更登记,驳回后不做修改重新提交后打开详情时提示组件错误

parent fd1fee8a
......@@ -280,8 +280,9 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
equip.setSafetyAssessmentCreditCode(Objects.toString(device.get("safetyAssessmentCreditCode"), ""));
equip.setSafetyAssessmentResult(Objects.toString(device.get("safetyAssessmentResult"), ""));
equip.setSafetyAssessmentDate(castDate2TimeStr(Objects.toString(device.get("safetyAssessmentDate"), null)));
if (!ObjectUtils.isEmpty(device.get("safetyAssessmentReport"))) {
equip.setSafetyAssessmentReport(JSONObject.toJSONString(device.get("safetyAssessmentReport")));
Object report = device.get("safetyAssessmentReport");
if (!ObjectUtils.isEmpty(report)) {
equip.setSafetyAssessmentReport(report instanceof String ? (String) report : JSONObject.toJSONString(report));
}
equipList.add(equip);
overDesignServiceLife.setEquList(Objects.toString(device.get("equListCode"), ""));
......@@ -985,7 +986,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
resultDataMap.put("sequenceNbrs", registration.getSequenceNbr());
commonService.convertStringToJsonobject(resultDataMap, new String[]{"otherAccessories"});
commonService.convertStringToJsonobject(resultDataMap, new String[]{"useRegistrationFormFile"});
commonService.convertStringToJsonobject(resultDataMap, new String[]{"safetyAssessmentReport"});
//commonService.convertStringToJsonobject(resultDataMap, new String[]{"safetyAssessmentReport"});
return resultDataMap;
}
......
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