1.代码格式化

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -150,8 +150,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private SuperviseInfoMapper superviseInfoMapper;
     @Autowired
     private JgUseRegistrationMapper jgUseRegistrationMapper;
-    @Autowired
-    private JgUseRegistrationEqServiceImpl jgUseRegistrationEqServiceImpl;
+
     @Autowired
     private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
 
@@ -162,6 +161,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     @Value("${add.equip.dict.code.suffix:CATEGORY_LIST_ADD}")
     private String equipAddDictCodeSuffix;
 
+    public static String[] jsonFields = {"insOtherAccessories", "installContractAttachment", "installProxyStatementAttachment" };
+
 
     /**
      * 设备注册信息
@@ -312,9 +313,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 resultMap.put(EQUIP_PARAMS_FORM_ID, equipParamsMap);
             }
         }
+
         return resultMap;
     }
 
+    @Override
     public Map<String, Object> getDetailByRecord(String record) {
         Map<String, Object> resultMap = new HashMap<>();
         // 设备种类
@@ -338,6 +341,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return resultMap;
     }
 
+    @Override
     public Map<String, Object> getDetailFieldCamelCaseByRecord(String record) {
         Map<String, Object> resultMap = new HashMap<>();
         // 设备种类
@@ -363,6 +367,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             resultMap.put("orgBranchName", superviseInfo.getOrgBranchName());
         }
         resultMap.remove("instanceId");
+        for(String field : jsonFields){
+            if(resultMap.get(field) != null && resultMap.get(field) instanceof String){
+                resultMap.put(field, JSON.parse(resultMap.get(field).toString()));
+            }
+        }
         return resultMap;
     }
 

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

@@ -512,7 +512,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         Map<String, Object> originalData = new HashMap<>();
         Map<String, Object> originalDataOther = new HashMap<>();
 
-        if ((jgChangeRegistrationReform.getStatus().equals("已完成") || jgChangeRegistrationReform.getStatus().equals("流程结束"))) {
+        if (("已完成".equals(jgChangeRegistrationReform.getStatus()) || "流程结束".equals(jgChangeRegistrationReform.getStatus()))) {
             // 完成时显示历史数据
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                     .eq("equ_id", equipId)