优化改造变更登记详情代码执行顺序

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -404,16 +404,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         if (ObjectUtils.isEmpty(equipId)) {
             equipId = jgChangeRegistrationReformEqMapper.selectEquipId(currentDocumentId);
         }
-        Map<String, Object> detail = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class);
+        Map<String, Object> detail = new HashMap<>();
         Map<String, Object> originalData = new HashMap<>();
         Map<String, Object> originalDataOther = new HashMap<>();
 
         if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) {
             originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
             originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
-            originalData.remove("sequenceNbr");
-            originalDataOther.remove("sequenceNbr");
-            originalDataOther.remove("status");
             if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
                 detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
             }
@@ -428,10 +425,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
                     .eq("registration_class", "改造登记"));
             originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
-            originalData.remove("sequenceNbr");
-            originalData.remove("status");
             detail.putAll(originalData);
         }
+        detail.putAll(JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class));
         return detail;
     }