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

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

@@ -93,7 +93,7 @@ public class DaHfysLogController {
         }
 
         if (StringUtils.isNotBlank(operatorDate_Start) && StringUtils.isNotBlank(operatorDate_End)) {
-            queryWrapper.and(i -> i.apply("APPLY_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));
+            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)
@@ -114,15 +114,15 @@ 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 void export(HttpServletResponse response, String companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_Eed, String searchText) throws IOException {
-        QueryWrapper<DaHfysLog> queryWrapper = SelectBtFHLog(companyBranch, mrArea, mrBook, operatorDate_Start, operatorDate_Eed, searchText);
+    public void export(HttpServletResponse response, String companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End, String searchText) throws IOException {
+        QueryWrapper<DaHfysLog> queryWrapper = SelectBtFHLog(companyBranch, mrArea, mrBook, operatorDate_Start, operatorDate_End, searchText);
         // 遍历查询结果进行赋值
         List<DaHfysLog> list = daHfysLogService.list(queryWrapper);
         //导出Excel
-        ExcleFileUtil.exportExcel(response, list, DaHfysLog.class, "恢复用户列表.xlsx");
+        ExcleFileUtil.exportExcel(response, list, DaHfysLog.class, "恢复用水列表.xlsx");
     }
 
 

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/mapper/DaBtLogMapper.java

@@ -25,8 +25,8 @@ import java.util.Map;
 public interface DaBtLogMapper extends BaseMapper<DaBtLog> {
     //报停自定义分页
     int selectMaxId();
-    Page<DaBtLog> selectDaCustomerBtPage(@Param("page") Page<DaBtLog> page, String  companyBranch,String mrArea,String mrBook,String btDateStart,String btDateEnd,String searchText);
+    Page<DaBtLog> selectDaCustomerBtPage(@Param("page") Page<DaBtLog> page, String  companyBranch,String mrArea,String mrBook,String operatorDateStart,String operatorDateEnd,String searchText);
 
     //查询导出
-    List<DaBtLog> selectDaCustomerBtPage(String  companyBranch,String mrArea,String mrBook,String btDateStart,String btDateEnd,String searchText);
+    List<DaBtLog> selectDaCustomerBtPage(String  companyBranch,String mrArea,String mrBook,String operatorDateStart,String operatorDateEnd,String searchText);
                                                             }

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/mapper/DaGhLogMapper.java

@@ -23,8 +23,8 @@ import java.util.List;
 public interface DaGhLogMapper extends BaseMapper<DaGhLog> {
 
     //过户自定义分页
-    Page<DaGhLog> selectDaCustomerGhPage(@Param("page") Page<DaGhLog> page, String  companyBranch, String mrArea, String mrBook, String btDateStart, String btDateEnd, String searchText);
+    Page<DaGhLog> selectDaCustomerGhPage(@Param("page") Page<DaGhLog> page, String  companyBranch, String mrArea, String mrBook, String operatorDateStart, String operatorDateEnd, String searchText);
 
     //过户导出自定义
-    List<DaGhLog> selectDaCustomerGhPage(String  companyBranch, String mrArea, String mrBook, String btDateStart, String btDateEnd, String searchText);
+    List<DaGhLog> selectDaCustomerGhPage(String  companyBranch, String mrArea, String mrBook, String operatorDateStart, String operatorDateEnd, String searchText);
 }

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/mapper/DahLogMapper.java

@@ -21,7 +21,7 @@ import java.util.List;
  */
 @Repository
 public interface DahLogMapper extends BaseMapper<DahLog> {
-    Page<DahLog> SelectDaxhPage(@Param("page") Page<DaBtLog> page, String  companyBranch, String mrArea, String mrBook, String btDateStart, String btDateEnd, String searchText);
+    Page<DahLog> SelectDaxhPage(@Param("page") Page<DaBtLog> page, String  companyBranch, String mrArea, String mrBook, String operatorDateStart, String operatorDateEnd, String searchText);
 
-    List<DahLog> SelectDaxhPage(String  companyBranch, String mrArea, String mrBook, String btDateStart, String btDateEnd, String searchText);
+    List<DahLog> SelectDaxhPage(String  companyBranch, String mrArea, String mrBook, String operatorDateStart, String operatorDateEnd, String searchText);
                                                         }

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

@@ -26,9 +26,9 @@
             and MR_BOOK=#{mrBook}
         </if>
         <!--报停时间-->
-        <if test="btDateStart!=null and btDateStart!='' and btDateEnd!=null and btDateEnd!='' ">
-            and OPERATOR_DATE between to_date(#{btDateStart},'yyyy-mm-dd hh24:mi:ss') and
-            to_date(#{btDateEnd},'yyyy-mm-dd hh24:mi:ss')
+        <if test="operatorDateStart!=null and operatorDateStart!='' and operatorDateEnd!=null and operatorDateEnd!='' ">
+            and OPERATOR_DATE between to_date(#{operatorDateStart},'yyyy-mm-dd hh24:mi:ss') and
+            to_date(#{operatorDateEnd},'yyyy-mm-dd hh24:mi:ss')
         </if>
     </select>
     <resultMap id="daBtLogMap" type="com.tofly.fees.userprofilemgt.entity.DaBtLog">

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

@@ -22,9 +22,9 @@
         and mr_book=#{mrBook}
     </if>
     <!--建档日期-->
-    <if test="btDateStart!=null and btDateStart!='' and btDateEnd!=null and btDateEnd!='' ">
-        and  OPERATOR_DATE between to_date(#{btDateStart},'yyyy-mm-dd hh24:mi:ss') and
-        to_date(#{btDateEnd},'yyyy-mm-dd hh24:mi:ss')
+    <if test="operatorDateStart!=null and operatorDateStart!='' and operatorDateEnd!=null and operatorDateEnd!='' ">
+        and  OPERATOR_DATE between to_date(#{operatorDateStart},'yyyy-mm-dd hh24:mi:ss') and
+        to_date(#{operatorDateEnd},'yyyy-mm-dd hh24:mi:ss')
     </if>
 </select>
     <resultMap id="daGhLogMap" type="com.tofly.fees.userprofilemgt.entity.DaGhLog">

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

@@ -5,8 +5,8 @@
         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_ADDRESS like
-            '%${SearchText}%' or PHONE like '%${SearchText}%' )
+            and ( CUSTOMER_NO like '%${searchText}%' or CUSTOMER_NAME like '%${searchText}%' or CUSTOMER_ADDR like
+            '%${searchText}%' or PHONE like '%${searchText}%' )
         </if>
         <!--公司 -->
         <if test="companyBranch !=null and companyBranch!='' and companyBranch!='all'">
@@ -18,12 +18,12 @@
         </if>
         <!--抄表本 -->
         <if test="mrBook !=null and mrBook!='' and mrBook!='all'">
-            and MR_BOOK=#{mr_book}
+            and MR_BOOK=#{mrBook}
         </if>
         <!--报停时间-->
-        <if test="btDateStart!=null and btDateStart!='' and btDateEnd!=null and btDateEnd!='' ">
-            and OPERATOR_DATE between to_date(#{btDateStart},'yyyy-mm-dd hh24:mi:ss') and
-            to_date(#{btDateEnd},'yyyy-mm-dd hh24:mi:ss')
+        <if test="operatorDateStart!=null and operatorDateStart!='' and operatorDateEnd!=null and operatorDateEnd!='' ">
+            and OPERATOR_DATE between to_date(#{operatorDateStart},'yyyy-mm-dd hh24:mi:ss') and
+            to_date(#{operatorDateEnd},'yyyy-mm-dd hh24:mi:ss')
         </if>
     </select>
     <resultMap id="dahLogMap" type="com.tofly.fees.userprofilemgt.entity.DahLog">