报停修改

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

@@ -105,13 +105,13 @@ public class DaBtLogController {
     public void export(HttpServletResponse response, String companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End, String searchText) throws IOException {
         // 遍历查询结果进行赋值
         List<DaBtLog> list = daBtLogMapper.selectDaCustomerBtPage(companyBranch, mrArea, mrBook, operatorDate_Start, operatorDate_End, searchText);
-        for (DaBtLog yhbt : list) {
-            if (yhbt.getHfysFlag().equals("0")) {
-                yhbt.setHfysFlag("未恢复");
-            } else {
-                yhbt.setHfysFlag("已恢复");
-            }
-        }
+//        for (DaBtLog yhbt : list) {
+//            if (yhbt.getHfysFlag().equals("0")) {
+//                yhbt.setHfysFlag("未恢复");
+//            } else {
+//                yhbt.setHfysFlag("已恢复");
+//            }
+//        }
         //导出excle
         ExcleFileUtil.exportExcel(response, list, DaBtLog.class, "用户报停记录.xlsx");
     }

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

@@ -68,12 +68,12 @@ public class DaGhLogController {
             @ApiImplicitParam(name = "companyBranch", value = "公司", dataType = "String"),
             @ApiImplicitParam(name = "mrArea", value = "片区", dataType = "String"),
             @ApiImplicitParam(name = "mrBook", value = "抄表本", dataType = "String"),
-            @ApiImplicitParam(name = "operatorDate_start", value = "开始时间", dataType = "String"),
-            @ApiImplicitParam(name = "operatorDate_end", value = "结束时间", dataType = "String")
+            @ApiImplicitParam(name = "operatorDate_Start", value = "开始时间", dataType = "String"),
+            @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) {
+    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);
+        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/resources/mapper/userprofilemgt/DaBtLogMapper.xml

@@ -23,11 +23,11 @@
         </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 APPLY_DATE between to_date(#{btDateStart},'yyyy-mm-dd hh24:mi:ss') and
+            and OPERATOR_DATE between to_date(#{btDateStart},'yyyy-mm-dd hh24:mi:ss') and
             to_date(#{btDateEnd},'yyyy-mm-dd hh24:mi:ss')
         </if>
     </select>