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/dto/JgChangeRegistrationReformDto.java

@@ -147,4 +147,7 @@ public class JgChangeRegistrationReformDto extends BaseDto {
     @ApiModelProperty (value = "code96333")
     private String code96333;
 
+    @ApiModelProperty (value = "设备地址")
+    private String equAddress;
+
 }

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

@@ -56,7 +56,7 @@
             <if test="dto.applicationDate != null and dto.applicationDate != ''">
                 and ur.ur.reg_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
             </if>
-            <if test="dto.equListCode != null and dto.equListCode != ''">
+            <if test="dto.equList != null and dto.equList != ''">
                 AND jri."EQU_LIST" = #{dto.equList}
             </if>
             <if test="dto.equCategory != null and dto.equCategory != ''">
@@ -71,12 +71,12 @@
             <if test="dto.code96333 != null and dto.code96333 != ''">
                 AND oi.CODE96333 like concat('%',#{dto.code96333},'%')
             </if>
-            <if test="dto.address != null and dto.address != ''">
+            <if test="dto.equAddress != null and dto.equAddress != ''">
                 AND (
-                ibjui."PROVINCE_NAME" LIKE CONCAT('%', #{dto.address}, '%')
-                OR ibjui."CITY_NAME" LIKE CONCAT('%', #{dto.address}, '%')
-                OR ibjui."COUNTY_NAME" LIKE CONCAT('%', #{dto.address}, '%')
-                OR ibjui."STREET_NAME" LIKE CONCAT('%', #{dto.address}, '%')
+                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}, '%')
                 )
             </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">
@@ -92,7 +92,11 @@
                 and (ur.use_unit_credit_code = #{dto.useUnitCreditCode} or (ur.transfer_to_user_ids like concat('%',#{currentUserId},'%')))
             </if>
         </where>
-        order by ur.rec_date desc
+        order by
+        <if test="sort != null">
+            isn.${sort.field} ${sort.sortType},
+        </if>
+            ur.rec_date desc
     </select>
     <select id="getDetail" resultType="java.util.Map">
         SELECT jri.EQU_CODE as equCode,