1.使用单位分页查询，，设备的使用信息还没写入，应该查询单据的数据

e65d25da · suhuiguang · 6b2beef6 · e65d25da
Commit e65d25da authored Sep 29, 2024 by suhuiguang
Hide whitespace changes
Inline Side-by-side

Showing with 42 additions and 43 deletions

JgUseRegistrationMapper.xml ...api/src/main/resources/mapper/JgUseRegistrationMapper.xml +42 -43

No files found.
--- a/amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
+++ b/amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
@@ -6,49 +6,48 @@
        where sequence_nbr = #{id}
    </update>
    <sql id="page-list">
-        select ur.sequence_nbr as sequenceNbr,
-        ur.audit_status as auditStatus,
-        date_format(ur.reg_date,'%Y-%m-%d') as regDate,
-        ur.use_unit_name as useUnitName,
-        ur.status,
-        ur.receive_org_name as receiveOrgName,
-        ur.use_address as place,
-        ur.instance_id as instanceId,
-        ur.apply_no as applyNo,
-        ur.next_execute_ids as nextExecuteIds,
-        ur.promoter,
-        GROUP_CONCAT(DISTINCT other.supervisory_code)  as supervisoryCode,
-        ur.use_registration_code  as useRegistrationCode,
-        date_format(ur.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
-        date_format(ur.create_date,'%Y-%m-%d')  as createDate,
-        ur.receive_org_name as receiveOrgName,
-        ur.next_execute_user_ids as nextExecuteUserIds,
-        ur.next_task_id as nextTaskId,
-        ur.create_user_id as createUserId,
-        ur.rec_date as recDate,
-        ur.manage_type as manageType,
-        ur.reg_type as regType,
-        GROUP_CONCAT(DISTINCT other.CODE96333) AS code96333,
-        GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY)) as equCategory,
-        GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_DEFINE)) as equDefine,
-        GROUP_CONCAT(DISTINCT jri.EQU_CATEGORY) AS equCategoryCode,
-        GROUP_CONCAT(DISTINCT jri.PRODUCT_NAME) AS productName,
-        GROUP_CONCAT(DISTINCT jri.EQU_CATEGORY) AS equCategoryCode,
-        GROUP_CONCAT(DISTINCT jri.EQU_CODE) AS equCode,
-        GROUP_CONCAT(DISTINCT jri.EQU_LIST) AS equList,
-        GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_LIST)) AS equListName,
-        GROUP_CONCAT(DISTINCT use.USE_INNER_CODE) AS innerCode,
-        GROUP_CONCAT(DISTINCT re.equ_id) AS equipId,
-        concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME") as fullAddress,
-        use."ADDRESS" as detailedAddress,
-        ibjsi.ORG_BRANCH_NAME as orgBranchName,
-        ur.cancel_reason as cancelReason
-        from tzs_jg_use_registration ur
-        LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
-        LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
-        LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
-        LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
-        LEFT JOIN idx_biz_jg_supervision_info ibjsi  on re.equ_id = ibjsi.RECORD
+        select
+            ur.sequence_nbr as sequenceNbr,
+            ur.audit_status as auditStatus,
+            date_format(ur.reg_date,'%Y-%m-%d') as regDate,
+            ur.use_unit_name as useUnitName,
+            ur.status,
+            ur.receive_org_name as receiveOrgName,
+            ur.use_address as place,
+            ur.instance_id as instanceId,
+            ur.apply_no as applyNo,
+            ur.next_execute_ids as nextExecuteIds,
+            ur.promoter,
+            ur.use_registration_code  as useRegistrationCode,
+            date_format(ur.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
+            date_format(ur.create_date,'%Y-%m-%d')  as createDate,
+            ur.receive_org_name as receiveOrgName,
+            ur.next_execute_user_ids as nextExecuteUserIds,
+            ur.next_task_id as nextTaskId,
+            ur.create_user_id as createUserId,
+            ur.rec_date as recDate,
+            ur.manage_type as manageType,
+            ur.reg_type as regType,
+            ur.use_address as fullAddress,
+            ur.cancel_reason as cancelReason,
+            GROUP_CONCAT(DISTINCT other.supervisory_code)  as supervisoryCode,
+            GROUP_CONCAT(DISTINCT other.CODE96333) AS code96333,
+            GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY)) as equCategory,
+            GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_DEFINE)) as equDefine,
+            GROUP_CONCAT(DISTINCT jri.EQU_CATEGORY) AS equCategoryCode,
+            GROUP_CONCAT(DISTINCT jri.PRODUCT_NAME) AS productName,
+            GROUP_CONCAT(DISTINCT jri.EQU_CATEGORY) AS equCategoryCode,
+            GROUP_CONCAT(DISTINCT jri.EQU_CODE) AS equCode,
+            GROUP_CONCAT(DISTINCT jri.EQU_LIST) AS equList,
+            GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_LIST)) AS equListName,
+            GROUP_CONCAT(DISTINCT re.equ_id) AS equipId,
+            GROUP_CONCAT(DISTINCT ibjsi.ORG_BRANCH_NAME) AS  orgBranchName
+        from
+            tzs_jg_use_registration ur
+            LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
+            LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
+            LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
+            LEFT JOIN idx_biz_jg_supervision_info ibjsi  on re.equ_id = ibjsi.RECORD
    </sql>

    <select id="getListPage" resultType="java.util.Map">