fix(jg):设备详情接口 添加 设备已经做过的业务查询

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -38,4 +38,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     Map<String, Object> getMaintenanceDetail(@Param("id")String id);
 
     Map<String, Object> getiInstallDetail(@Param("id")String id);
+
+    Map<String, Object> getUseRegistrationDetail(@Param("id")String id);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -272,6 +272,39 @@
         LIMIT 1
     </select>
 
+    <select id="getUseRegistrationDetail" resultType="java.util.Map">
+        SELECT tjur."status"           as status,
+               tjur."sequence_nbr"     as sequenceNbr,
+               tjur."supervisory_code" as supervisoryCode,
+               tjur."receive_org_name" as receiveOrgName
+        FROM "tzs_jg_use_registration_eq" AS tjure
+                 LEFT JOIN "tzs_jg_use_registration" AS tjur ON tjure."equip_transfer_id" = tjur."sequence_nbr"
+        WHERE tjure."equ_id" = #{id}
+          AND tjur."status" = '已完成'
+        ORDER BY tjure."rec_date" desc
+        LIMIT 1
+    </select>
+
+    <select id="getMaintenanceDetail" resultType="java.util.Map">
+        SELECT
+            tjmc."maintenance_unit_name"              as maintenanceUnitName,
+            tjmc."use_unit_name"                      as useUnitName,
+            tjmc."maintenance_manager_name"           as maintenanceManagerName,
+            tjmc."maintenance_manager_phone"          as maintenanceManagerPhone,
+            tjmc."maintenance_manager_one_name"       as maintenanceManagerOneName,
+            tjmc."maintenance_manager_one_phone"      as maintenanceManagerOnePhone,
+            tjmc."maintenance_manager_two_name"       as maintenanceManagerTwoName,
+            tjmc."maintenance_manager_two_phone"      as maintenanceManagerTwoPhone,
+            tjmc."maintenance_contract"               as maintenanceContract,
+            tjmc."other_accessories"                  as maintOtherAccessories
+        FROM "tzs_jg_maintenance_contract_eq"   as tjmce
+        LEFT JOIN "tzs_jg_maintenance_contract" as tjmc
+        ON tjmce."equip_transfer_id" = tjmc."sequence_nbr"
+        WHERE tjmce."equ_id" = #{id} AND tjmc."status" = '已完成'
+        ORDER BY tjmce."rec_date" desc
+        LIMIT 1
+    </select>
+
     <select id="getMaintenanceDetail" resultType="java.util.Map">
         SELECT
             tjmc."maintenance_unit_name"              as maintenanceUnitName,

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

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
@@ -148,7 +149,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     @Autowired
     private SuperviseInfoMapper superviseInfoMapper;
     @Autowired
-    private JgInstallationNoticeEqServiceImpl jgInstallationNoticeEqServiceImpl;
+    private JgUseRegistrationMapper jgUseRegistrationMapper;
     @Autowired
     private JgUseRegistrationEqServiceImpl jgUseRegistrationEqServiceImpl;
     @Autowired
@@ -752,10 +753,28 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
         }
 
+        objMap.put("completedBusinessTypes",judgeTheBusinessAccordingByRecord(record));
         return objMap;
     }
 
 
+    /**
+     * 根据record判断设备完成了哪些业务（安装告知/维保备案/使用登记）
+     * @return
+     */
+    public List<String> judgeTheBusinessAccordingByRecord(String record){
+        List<String> list = new ArrayList<>();
+        // 安装告知
+        Map<String, Object> installDetail = jgUseRegistrationMapper.getiInstallDetail(record);
+        list.add(!ObjectUtils.isEmpty(installDetail) ? "安装告知" : null);
+        // 维保备案
+        Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetail(record);
+        list.add(!ObjectUtils.isEmpty(maintenanceDetail) ? "维保备案" : null);
+        // 使用登记
+        Map<String, Object> useRegistrationDetail = jgUseRegistrationMapper.getUseRegistrationDetail(record);
+        list.add(!ObjectUtils.isEmpty(useRegistrationDetail) ? "使用登记" : null);
+        return list;
+    }
 
     /**
      * 查询设备技术参数