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/entity/JgChangeRegistrationTransfer.java

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -256,4 +255,10 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
      */
     @TableField("receive_company_org_code")
     private String receiveCompanyOrgCode;
+
+    /**
+     * 移装类型（0区内，1区外）
+     */
+    @TableField("transfer_type")
+    private String transferType;
 }

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

@@ -40,5 +40,28 @@ public class JgChangeRegistrationTransferEq extends BaseEntity {
     @TableField("is_invalid")
     private Boolean isInvalid =false;
 
+    /**
+     * 设备种类
+     */
+    @TableField("equ_list")
+    private String equList;
+
+    /**
+     * 设备类别
+     */
+    @TableField("equ_category")
+    private String equCategory;
+
+    /**
+     * 设备品种
+     */
+    @TableField("equ_define")
+    private String equDefine;
+
+    /**
+     * 设备信息json
+     */
+    @TableField("device_info")
+    private String deviceInfo;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferEqService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq;
 
 /**
@@ -10,7 +11,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq
  * @author system_generator
  * @date 2023-12-20
  */
-public interface IJgChangeRegistrationTransferEqService {
+public interface IJgChangeRegistrationTransferEqService extends IService<JgChangeRegistrationTransferEq> {
 
     boolean saveOrUpdateTransferEqData(JgChangeRegistrationTransferEq transferEq);
 

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

@@ -8,6 +8,12 @@
     </update>
 
     <select id="getListPage" resultType="java.util.Map">
+        WITH crteq_limited AS (
+        SELECT
+        *,
+        ROW_NUMBER() OVER (PARTITION BY equip_transfer_id ORDER BY some_column) as rn
+        FROM tzs_jg_change_registration_transfer_eq
+        )
         select
         crt.sequence_nbr as sequenceNbr,
         crt.audit_status as auditStatus,
@@ -23,23 +29,18 @@
         crt.next_execute_user_ids as nextExecuteUserIds,
         crt.create_user_id as createUserId,
         crt.next_task_id as nextTaskId,
+        crt.full_address as fullAddress,
         use.USE_UNIT_NAME as useUnitName,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
-        use.USE_INNER_CODE as innerCode,
-        crteq.equ_id as equipId,
-        oi.SUPERVISORY_CODE AS supervisoryCode,
-        oi.CODE96333 as code96333,
         concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME") as allAddress,
-        use."ADDRESS" as detailedAddress,
         (SELECT name from tz_equipment_category WHERE code = jri.EQU_LIST) AS equList,
         (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
         (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine
         from tzs_jg_change_registration_transfer crt
-        LEFT JOIN tzs_jg_change_registration_transfer_eq crteq  on crt.sequence_nbr = crteq.equip_transfer_id
+        LEFT JOIN crteq_limited crteq ON crt.sequence_nbr = crteq.equip_transfer_id AND crteq.rn = 1
         LEFT JOIN idx_biz_jg_register_info jri  on crteq.equ_id = jri.RECORD
         LEFT JOIN idx_biz_jg_use_info use on crteq.equ_id = use.RECORD
-        LEFT JOIN idx_biz_jg_other_info oi ON  oi.RECORD = crteq.equ_id
         <where>
             and  crt.is_delete = 0
             <if test="dto.equCategory != null and dto.equCategory != ''">