移装和安装 地址设备地址问题修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgTransferNotice.java

@@ -319,5 +319,8 @@ public class JgTransferNotice extends BaseEntity {
     @TableField("\"next_execute_user_ids\"")
     private String nextExecuteUserIds;
 
+    @TableField(exist = false)
+    private String equAddress;
+
 
 }

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

@@ -22,14 +22,16 @@
         isn.promoter,
         isn.next_execute_ids AS nextExecuteIds,
         isn.instance_status AS instanceStatus,
-        isn.equ_address AS equAddress,
+<!--        isn.equ_address AS equAddress,-->
         isn.handle_date AS handleDate,
         isn.equ_list AS equList,
         isn.notice_report_url AS noticeReportUrl,
         isn.create_user_id as createUserId,
-        isn.next_execute_user_ids as nextExecuteUserIds
-        FROM
-        tzs_jg_installation_notice isn
+        isn.next_execute_user_ids as nextExecuteUserIds,
+        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
+        FROM tzs_jg_installation_notice isn
+        LEFT JOIN tzs_jg_installation_notice_eq insEq on insEq.equip_transfer_id = isn.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info ibjui on insEq.equ_id = ibjui.RECORD
         <where>
             isn.is_delete = false
             <if test="param != null ">

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

@@ -26,12 +26,14 @@
         ec."name" AS equipCateName,
         tjtn.handle_date AS handleDate,
         tjtn.create_user_id as createUserId,
-        tjtn.next_execute_user_ids as nextExecuteUserIds
+        tjtn.next_execute_user_ids as nextExecuteUserIds,
+        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
         FROM
             tzs_jg_transfer_notice tjtn
             LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
             LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
             LEFT JOIN tz_equipment_category ec ON ec.code = ri.equ_category
+            LEFT JOIN idx_biz_jg_use_info ibjui on re.equ_id = ibjui.RECORD
         <where>
             tjtn.is_delete = false
             <if test="param != null ">

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

@@ -499,6 +499,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             }
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
+            dto.setEquAddress(obj.getOrDefault("ADDRESS", "").toString());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });