Commit a2e14b9e authored by caotao's avatar caotao

撤回时model设置错误问题处理。

parent 406085a3
...@@ -379,7 +379,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -379,7 +379,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jsonObject.put("nextTaskId", jgChangeRegistrationReform.getNextTaskId()); jsonObject.put("nextTaskId", jgChangeRegistrationReform.getNextTaskId());
jsonObject.put("nextExecuteUser", jgChangeRegistrationReform.getNextExecutorIds()); jsonObject.put("nextExecuteUser", jgChangeRegistrationReform.getNextExecutorIds());
jsonObject.put("taskType",BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode()); jsonObject.put("taskType",BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
jsonObject.put("model",jgChangeRegistrationReform); jsonObject.put("model",conveterTaskMessageDTO(jgChangeRegistrationReform));
commonServiceImpl.rollbackTask(instanceId,jsonObject); commonServiceImpl.rollbackTask(instanceId,jsonObject);
} }
...@@ -411,12 +411,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -411,12 +411,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
if ((jgChangeRegistrationReform.getStatus().equals("已完成") || jgChangeRegistrationReform.getStatus().equals("流程结束"))) { if ((jgChangeRegistrationReform.getStatus().equals("已完成") || jgChangeRegistrationReform.getStatus().equals("流程结束"))) {
originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId); originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId); originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
}
if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) {
detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
}
detail.putAll(originalDataOther); detail.putAll(originalDataOther);
detail.put("techInfo",originalData); detail.put("techInfo",originalData);
} else { } else {
......
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