过户、报停、恢复用水、销户，分页查询增加排序映射

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
+import com.tofly.fees.common.dbhelper.PageSortHelper;
 import com.tofly.fees.common.enums.UserStatusEnum;
 import com.tofly.fees.common.util.GuidGenerator;
 import com.tofly.fees.financialmgt.mapper.SfRecMapper;
@@ -72,12 +73,13 @@ public class DaBtLogController {
             @ApiImplicitParam(name = "searchText", value = "模糊查询(编号、姓名、电话、地址)", dataType = "String")
     })
     public ResultRespone getDaBtLogPage(Page page, String searchText, String companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End) {
+        PageSortHelper.setPageSort(DaBtLog.class, page);
         // 执行分页查询
         IPage<DaBtLog> yhdaPage = daBtLogMapper.selectDaCustomerBtPage(page, companyBranch, mrArea, mrBook, operatorDate_Start, operatorDate_End, searchText);
         // 遍历查询结果进行赋值
         List<DaBtLog> yhbtList = yhdaPage.getRecords();
         for (DaBtLog yhbt : yhbtList) {
-            if (yhbt.getHfysFlag().equals("0")) {
+            if (yhbt.getHfysFlag() != null && yhbt.getHfysFlag().equals("0")) {
                 yhbt.setHfysFlag("未恢复");
             } else {
                 yhbt.setHfysFlag("已恢复");

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.fees.common.Excel.ExcleFileUtil;
+import com.tofly.fees.common.dbhelper.PageSortHelper;
 import com.tofly.fees.common.util.GuidGenerator;
 import com.tofly.fees.financialmgt.mapper.SfRecMapper;
 import com.tofly.fees.userprofilemgt.entity.DaCustomer;
@@ -71,6 +72,7 @@ public class DaGhLogController {
             @ApiImplicitParam(name = "operatorDate_End", value = "结束时间", dataType = "String")
     })
     public ResultRespone getDaGhLogPage(Page page, String companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End, String searchText) {
+        PageSortHelper.setPageSort(DaGhLog.class, page);
         IPage<DaGhLog> daGhLogIPage = daGhLogMapper.selectDaCustomerGhPage(page, companyBranch, mrArea, mrBook, operatorDate_Start, operatorDate_End, searchText);
         return ResultRespone.success(daGhLogIPage);
     }

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.fees.common.Excel.ExcleFileUtil;
+import com.tofly.fees.common.dbhelper.PageSortHelper;
 import com.tofly.fees.common.enums.UserStatusEnum;
 import com.tofly.fees.common.util.GuidGenerator;
 import com.tofly.fees.financialmgt.mapper.SfRecMapper;
@@ -70,6 +71,7 @@ public class DaHfysLogController {
             @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) {
+        PageSortHelper.setPageSort(DaHfysLog.class, page);
         QueryWrapper<DaHfysLog> queryWrapper = SelectBtFHLog(companyBranch, area, book, operatorDate_Start, operatorDate_End, searchText);
         // 执行分页查询
         IPage<DaHfysLog> btfhPage = daHfysLogService.page(page, queryWrapper);

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.fees.common.Excel.ExcleFileUtil;
+import com.tofly.fees.common.dbhelper.PageSortHelper;
 import com.tofly.fees.common.enums.UserStatusEnum;
 import com.tofly.fees.common.util.GuidGenerator;
 import com.tofly.fees.financialmgt.mapper.SfRecMapper;
@@ -72,6 +73,7 @@ public class DahLogController {
             @ApiImplicitParam(name = "searchText", value = "模糊查询(编号、姓名、电话、地址)", dataType = "String")
     })
     public ResultRespone getDahLogPage(Page page, String companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End, String searchText) {
+        PageSortHelper.setPageSort(DahLog.class, page);
         IPage<DahLog> dahLogIPage = dahLogMapper.SelectDaxhPage(page, companyBranch, mrArea, mrBook, operatorDate_Start, operatorDate_End, searchText);
         return ResultRespone.success(dahLogIPage);
     }