fix(jg):改造变更列表查询修改

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

@@ -20,7 +20,7 @@
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
-        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
+        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME) as place,
         use."ADDRESS" as detailedAddress,
         ifnull(ur.instance_id, '') as instanceId,
         re.equ_id as equipId,
@@ -47,6 +47,9 @@
             <if test="dto.supervisoryCode != null and dto.supervisoryCode != ''">
                 and ur.supervisory_code like concat('%',#{dto.supervisoryCode},'%')
             </if>
+            <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
+                and ur.use_registration_code like concat('%',#{dto.useRegistrationCode},'%')
+            </if>
             <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
                 and ur.receive_company_code = #{dto.receiveCompanyCode}
             </if>
@@ -54,7 +57,7 @@
                 and ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
             <if test="dto.applicationDate != null and dto.applicationDate != ''">
-                and ur.ur.reg_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
+                and ur.reg_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
             </if>
             <if test="dto.equList != null and dto.equList != ''">
                 AND jri."EQU_LIST" = #{dto.equList}
@@ -73,10 +76,10 @@
             </if>
             <if test="dto.equAddress != null and dto.equAddress != ''">
                 AND (
-                ibjui."PROVINCE_NAME" LIKE CONCAT('%', #{dto.equAddress}, '%')
-                OR ibjui."CITY_NAME" LIKE CONCAT('%', #{dto.equAddress}, '%')
-                OR ibjui."COUNTY_NAME" LIKE CONCAT('%', #{dto.equAddress}, '%')
-                OR ibjui."STREET_NAME" LIKE CONCAT('%', #{dto.equAddress}, '%')
+                use."PROVINCE_NAME" LIKE CONCAT('%', #{dto.equAddress}, '%')
+                OR use."CITY_NAME" LIKE CONCAT('%', #{dto.equAddress}, '%')
+                OR use."COUNTY_NAME" LIKE CONCAT('%', #{dto.equAddress}, '%')
+                OR use."STREET_NAME" LIKE CONCAT('%', #{dto.equAddress}, '%')
                 )
             </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">