1.bug 21075

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

@@ -92,10 +92,6 @@
             res.inspection_type_name,
             ibjui.use_unit_name,
             ibjui.use_unit_credit_code,
-            ibjui.province_name,
-            ibjui.city_name,
-            ibjui.county_name,
-            ibjui.street_name,
             ibjri.equ_code,
             ibjui.use_inner_code,
             ibjri.equ_list,
@@ -103,12 +99,13 @@
             ibjri.use_org_code,
             res.equ_define,
             res.result_type,
-            res.supervisory_code,
-            ibjui.ADDRESS equUseAddress
+            ot.supervisory_code,
+            concat(ibjui.province_name, ibjui.city_name,ibjui.county_name, ibjui.street_name,ibjui.ADDRESS ) as  equUseAddress
         FROM
             tz_jyjc_inspection_result res
             LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.record = res.equip_unicode
             LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.record = ibjri.record
+            LEFT JOIN idx_biz_jg_other_info ot ON ot.record = ibjri.record
         <where>
             <if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null">
                 and res.application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
@@ -126,7 +123,7 @@
                 and ibjri.equ_list = #{jyjcInspectionResultModel.equList}
             </if>
             <if test="jyjcInspectionResultModel.supervisoryCode != '' and jyjcInspectionResultModel.supervisoryCode != null">
-                and res.supervisory_code like concat('%',#{jyjcInspectionResultModel.supervisoryCode},'%')
+                and ot.supervisory_code like concat('%',#{jyjcInspectionResultModel.supervisoryCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.equCode != '' and jyjcInspectionResultModel.equCode != null">
                 and ibjri.equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')