历史设备登记通过record查询设备详情修改

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

@@ -192,23 +192,24 @@
         ORDER BY INSPECT_DATE desc LIMIT 1
     </select>
     <select id="getUseDetail" resultType="java.util.Map">
-        SELECT USE_UNIT_NAME as useUnitName,
-               USE_UNIT_CREDIT_CODE as useUnitCreditCode,
-               USE_PLACE as usePlace,
-               SAFETY_MANAGER as safetyManager,
-               SAFETY_MANAGER_CODE as safetyManagerCode,
-               PHONE as phone,
-               concat(ESTATE_UNIT_CREDIT_CODE, '_', ESTATE_UNIT_NAME)    as estateUnitName,
+        SELECT ibjui.USE_UNIT_NAME as useUnitName,
+                ibjui.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
+                ibjui.USE_PLACE as usePlace,
+                ibjui.SAFETY_MANAGER as safetyManager,
+                ibjui.SAFETY_MANAGER_CODE as safetyManagerCode,
+               concat(tzi.sequence_nbr,'_',SAFETY_MANAGER) as safetyManagerSeq,
+               ibjui."PHONE" as phone,
+               concat(ibjui.ESTATE_UNIT_CREDIT_CODE, '_', ibjui.ESTATE_UNIT_NAME)    as estateUnitName,
 --                ESTATE_UNIT_NAME as estateUnitName,
 --                ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,
-               ADDRESS as address,
-               PROVINCE as province,
-               CITY as city,
-               COUNTY as county,
-               USE_INNER_CODE as useInnerCode,
-               LONGITUDE_LATITUDE as longitudeLatitude,
-               FACTORY_USE_SITE_STREET as factoryUseSiteStreet
-        FROM "idx_biz_jg_use_info"  where RECORD = #{id}
+                ibjui.ADDRESS as address,
+                ibjui.PROVINCE as province,
+                ibjui.CITY as city,
+                ibjui.COUNTY as county,
+                ibjui.USE_INNER_CODE as useInnerCode,
+                ibjui.LONGITUDE_LATITUDE as longitudeLatitude,
+                ibjui.FACTORY_USE_SITE_STREET as factoryUseSiteStreet
+        FROM "idx_biz_jg_use_info"  ibjui left join tzs_user_info tzi on ibjui."PHONE" = tzi."phone"  where RECORD = #{id}
     </select>
     <select id="getEquipListPage" resultType="java.util.Map">
         SELECT jri.EQU_CODE as equCode,

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

@@ -1696,6 +1696,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             detail.putAll(inspectDetail);
         }
         if (!ObjectUtils.isEmpty(useDetail)) {
+            useDetail.put("safetyManager", useDetail.get("safetyManagerSeq"));
             detail.putAll(useDetail);
         }
         if (!ObjectUtils.isEmpty(desDetail)) {