合并列表查询修改

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -5,27 +5,13 @@
     <select id="queryForDataList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         SELECT
-        tzjia.sequence_nbr,
-        tzjia.process_instance_id,
-        tzjia.workflow_node,
-        tzjia.biz_type,
-        tzjia.application_no,
+        tzjia.*
         cdd1.NAME AS inspectionClassify,
         cdd3.NAME AS inspectionType,
-        tzjia.inspection_unit_code,
         cdd.NAME AS equipClassify,
-        tzjia.number_of_equip,
-        tzjia.inspection_unit_code,
-        tzjia.application_date,
-        tzjia.accept_date,
-        tzjia.inspection_charge_phone,
         tbei.use_unit AS applicationUnitName,
         tbei1.use_unit AS inspectionUnitName,
-        tzjia.status,
         cdd2.NAME AS statusName,
-        tzjia.next_execute_ids as nextExecuteIds,
-        tzjia.promoter,
-        tzjia.create_user_id,
         (select  group_concat(name)  from  tzs_user_info where  find_in_set(sequence_nbr,tzjia.inspection_charge_person))  as  inspectionChargePerson        FROM
         tz_jyjc_inspection_application AS tzjia
         LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
@@ -82,29 +68,13 @@
 
     <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         SELECT
-        DISTINCT(tzjia.sequence_nbr),
-        tzjia.process_instance_id,
-        tzjia.workflow_node,
-        tzjia.biz_type,
-        tzjia.application_no,
+        tzjia.*
         cdd1.NAME AS inspectionClassify,
         cdd3.NAME AS inspectionType,
-        tzjia.inspection_unit_code,
         cdd.NAME AS equipClassify,
-        tzjia.number_of_equip,
-        tzjia.inspection_unit_code,
-        tzjia.application_date,
-        tzjia.accept_date,
-        tzjia.inspection_charge_phone,
         tbei.use_unit AS applicationUnitName,
         tbei1.use_unit AS inspectionUnitName,
-        tzjia.status,
-        cdd2.NAME AS statusName,
-        tzjia.next_execute_ids as nextExecuteIds,
-        tzjia.promoter,
-        tzjia.create_user_id,
-        tzjia.next_execute_user_ids as nextExecuteUserIds,
-        tzjia.inspection_charge_person as  inspectionChargePerson
+        cdd2.NAME AS statusName
         FROM
         tz_jyjc_inspection_application AS tzjia
         LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -6,28 +6,7 @@
     <select id="selectJyjcOpeningApplicationList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel">
         select
-        a.unit_code,
-        a.detection_region,
-        a.detection_region_name,
-        a.application_seq,
-        a.result_type,
-        a.expiry_date,
-        a.accept_date,
-        a.status,
-        a.remark,
-        a.sequence_nbr,
-        a.rec_date,
-        a.rec_user_id,
-        a.rec_user_name,
-        a.apply_time,
-        a.workflow_prostance_id,
-        a.workflow_role,
-        a.unit_code_name,
-        cdd2.NAME as status_name,
-        a.workflow_active_key,
-        a.next_execute_ids,
-        a.promoter,
-        a.create_user_id
+        a.*,cdd2.NAME as status_name
         from tz_jyjc_opening_application a
             LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = a.status and cdd2.type = 'JYLCSQ'
         <where>