继续对过户、报停、启封、销户的bug处理，字段名修正。

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/controller/DaHfysLogController.java

@@ -67,12 +67,12 @@ public class DaHfysLogController {
             @ApiImplicitParam(name = "mrArea", value = "片区", dataType = "String"),
             @ApiImplicitParam(name = "mrBook", value = "抄表本", dataType = "String"),
             @ApiImplicitParam(name = "operatorDate_Start", value = "开始时间", dataType = "String"),
-            @ApiImplicitParam(name = "operatorDate_Eed", value = "结束时间", dataType = "String"),
+            @ApiImplicitParam(name = "operatorDate_End", value = "结束时间", dataType = "String"),
             @ApiImplicitParam(name = "searchText", value = "模糊查询(编号、姓名、电话、地址)", dataType = "String")
     })
-    public ResultRespone getDaHfysLogPage(Page page, String companyBranch, String area, String book, String operatorDate_Start, String operatorDate_End, String searchText) {
+    public ResultRespone getDaHfysLogPage(Page page, String companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End, String searchText) {
         PageSortHelper.setPageSort(DaHfysLog.class, page);
-        QueryWrapper<DaHfysLog> queryWrapper = SelectBtFHLog(companyBranch, area, book, operatorDate_Start, operatorDate_End, searchText);
+        QueryWrapper<DaHfysLog> queryWrapper = SelectBtFHLog(companyBranch, mrArea, mrBook, operatorDate_Start, operatorDate_End, searchText);
         // 执行分页查询
         IPage<DaHfysLog> btfhPage = daHfysLogService.page(page, queryWrapper);
         // 遍历查询结果进行赋值
@@ -96,13 +96,12 @@ public class DaHfysLogController {
             queryWrapper.and(i -> i.apply("OPERATOR_DATE BETWEEN to_date({0},'yyyy-mm-dd hh24:mi:ss') AND to_date({1},'yyyy-mm-dd hh24:mi:ss')", operatorDate_Start, operatorDate_End));
         }
         if (StringUtils.isNotBlank(searchText)) {
-            queryWrapper.like("CUSTOMER_NO", searchText)
-                    .or()
-                    .like("CUSTOMER_ADDR", searchText)
-                    .or()
-                    .like("PHONE", searchText)
-                    .or()
-                    .like("CUSTOMER_NAME", searchText);
+            queryWrapper.and(
+                    query -> query.like("CUSTOMER_NO", searchText).or()
+                            .like("CUSTOMER_ADDR",searchText).or()
+                            .like("PHONE",searchText)
+                            .like("CUSTOMER_NAME",searchText)
+            );
         }
         return queryWrapper;
     }

collect-fees/collect-fees-service/src/main/resources/mapper/userprofilemgt/DahLogMapper.xml

@@ -5,7 +5,7 @@
         select  *     from TF_YWYS_DA_XH_LOG where 1=1
         <!--模糊查询 -->
         <if test="searchText != null and searchText != ''">
-            and ( CUSTOMER_NO like '%${searchText}%' or CUSTOMER_NAME like '%${searchText}%' or CUSTOMER_ADDR like
+            and ( CUSTOMER_NO like '%${searchText}%' or CUSTOMER_NAME like '%${searchText}%' or COSTOMER_ADDR like
             '%${searchText}%' or PHONE like '%${searchText}%' )
         </if>
         <!--公司 -->