Merge branch 'develop_tzs_register' of…

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

@@ -34,4 +34,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     List<Map<String, Object>> getDetailById(@Param("id") Long id);
 
     String getEquType(@Param("record") String record);
+
+    Map<String, Object> getMaintenanceDetail(@Param("id")String id);
+
+    Map<String, Object> getiInstallDetail(@Param("id")String id);
 }

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

@@ -249,4 +249,45 @@
         where jri.RECORD = #{record}
     </select>
 
+    <select id="getiInstallDetail" resultType="java.util.Map">
+        SELECT
+            tjin."province_name"                   as  installProvince ,
+            tjin."city_name"                   as   installCity,
+            tjin."county_name"                   as  installCounty ,
+            tjin."street_name"                   as  installStreet ,
+            tjin."install_leader_name"                   as installLeaderName  ,
+            tjin."address"                   as  installAddress ,
+            tjin."is_xixian"                   as  isXixian ,
+            tjin."install_leader_name"                   as  installLeaderName ,
+            tjin."install_leader_phone"                   as  installLeaderPhone ,
+            tjin."install_start_date"                   as  installStartDate ,
+            tjin."property_unit_name"                   as  propertyUnitName ,
+            tjin."use_unit_name"                   as  useUnitName ,
+            tjin."proxy_statement_attachment"                   as  proxyStatementAttachment ,
+            tjin."install_contract_attachment"                   as  installContractAttachment ,
+            tjin."other_accessories"                   as  insOtherAccessories
+        FROM "tzs_jg_installation_notice_eq" as tjine
+        LEFT JOIN "tzs_jg_installation_notice" as tjin
+        ON tjine."equip_transfer_id" = tjine."sequence_nbr"
+        WHERE tjine."equ_id" = #{id}
+    </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}
+    </select>
+
 </mapper>

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

@@ -779,7 +779,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
             IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
             jsonObject.put("carNumber",idxBizJgRegisterInfo.getCarNumber());
-            // 转化 其他附件 字段
+            // 转化 附件 字段
             if (!ObjectUtils.isEmpty(jsonObject.get("otherAccessoriesDes"))){
                 jsonObject.put("otherAccessoriesDes", JSON.parse(String.valueOf(jsonObject.get("otherAccessoriesDes"))));
             }
@@ -789,6 +789,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (!ObjectUtils.isEmpty(jsonObject.get("otherAccessoriesReg"))){
                 jsonObject.put("otherAccessoriesReg", JSON.parse(String.valueOf(jsonObject.get("otherAccessoriesReg"))));
             }
+            if (!ObjectUtils.isEmpty(jsonObject.get("maintOtherAccessories"))){
+                jsonObject.put("maintOtherAccessories", JSON.parse(String.valueOf(jsonObject.get("maintOtherAccessories"))));
+            }
+            if (!ObjectUtils.isEmpty(jsonObject.get("insOtherAccessories"))){
+                jsonObject.put("maintenanceContract", JSON.parse(String.valueOf(jsonObject.get("maintenanceContract"))));
+            }
+            if (!ObjectUtils.isEmpty(jsonObject.get("insOtherAccessories"))){
+                jsonObject.put("insOtherAccessories", JSON.parse(String.valueOf(jsonObject.get("insOtherAccessories"))));
+            }
+            if (!ObjectUtils.isEmpty(jsonObject.get("installContractAttachment"))){
+                jsonObject.put("installContractAttachment", JSON.parse(String.valueOf(jsonObject.get("installContractAttachment"))));
+            }
+            if (!ObjectUtils.isEmpty(jsonObject.get("proxyStatementAttachment"))){
+                jsonObject.put("proxyStatementAttachment", JSON.parse(String.valueOf(jsonObject.get("proxyStatementAttachment"))));
+            }
             return jsonObject;
         }
         // 基本信息 + 制造信息
@@ -799,6 +814,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         Map<String, Object> useDetail = this.baseMapper.getUseDetail(record);
         // 设计信息
         Map<String, Object> desDetail = this.baseMapper.getDesDetail(record);
+        // 安装信息
+        Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record);
+        // 维保信息
+        Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record);
         if (!ObjectUtils.isEmpty(inspectDetail)) {
             detail.putAll(inspectDetail);
         }
@@ -808,6 +827,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(desDetail)) {
             detail.putAll(desDetail);
         }
+        if (!ObjectUtils.isEmpty(maintenanceDetail)) {
+            detail.putAll(maintenanceDetail);
+        }
+        if (!ObjectUtils.isEmpty(installDetail)) {
+            detail.putAll(installDetail);
+        }
         detail.remove("safetyManager");
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
@@ -820,6 +845,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         detail.put("otherAccessoriesDes", JSON.parse(String.valueOf(detail.get("otherAccessoriesDes"))));
         detail.put("otherAccessoriesFact", JSON.parse(String.valueOf(detail.get("otherAccessoriesFact"))));
         detail.put("otherAccessoriesReg", JSON.parse(String.valueOf(detail.get("otherAccessoriesReg"))));
+        detail.put("proxyStatementAttachment", JSON.parse(String.valueOf(detail.get("proxyStatementAttachment"))));
+        detail.put("installContractAttachment", JSON.parse(String.valueOf(detail.get("installContractAttachment"))));
+        detail.put("insOtherAccessories", JSON.parse(String.valueOf(detail.get("insOtherAccessories"))));
+        detail.put("maintenanceContract", JSON.parse(String.valueOf(detail.get("maintenanceContract"))));
+        detail.put("maintOtherAccessories", JSON.parse(String.valueOf(detail.get("maintOtherAccessories"))));
         detail.put("province", "610000");
         return detail;
     }