fix(jg):设备详情接口 设备业务数据添加

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

@@ -753,7 +753,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
         }
 
-        objMap.put("completedBusinessTypes",judgeTheBusinessAccordingByRecord(record));
+        objMap.put("completedBusinessTypes",judgeTheBusinessAccordingByRecord(record,objMap));
         return objMap;
     }
 
@@ -762,18 +762,27 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      * 根据record判断设备完成了哪些业务（安装告知/维保备案/使用登记）
      * @return
      */
-    public List<String> judgeTheBusinessAccordingByRecord(String record){
-        List<String> list = new ArrayList<>();
+    public List<String> judgeTheBusinessAccordingByRecord(String record,Map<String, Object> objMap){
+        List<String> businessList = new ArrayList<>();
         // 安装告知
         Map<String, Object> installDetail = jgUseRegistrationMapper.getiInstallDetail(record);
-        list.add(!ObjectUtils.isEmpty(installDetail) ? "安装告知" : null);
+        if (!ObjectUtils.isEmpty(installDetail)){
+            businessList.add("安装告知");
+            objMap.putAll(installDetail);
+        }
         // 维保备案
         Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetail(record);
-        list.add(!ObjectUtils.isEmpty(maintenanceDetail) ? "维保备案" : null);
+        if (!ObjectUtils.isEmpty(maintenanceDetail)){
+            businessList.add("维保备案");
+            objMap.putAll(maintenanceDetail);
+        }
         // 使用登记
         Map<String, Object> useRegistrationDetail = jgUseRegistrationMapper.getUseRegistrationDetail(record);
-        list.add(!ObjectUtils.isEmpty(useRegistrationDetail) ? "使用登记" : null);
-        return list;
+        if (!ObjectUtils.isEmpty(useRegistrationDetail)){
+            businessList.add("使用登记");
+            objMap.putAll(useRegistrationDetail);
+        }
+        return businessList;
     }
 
     /**