接口111w

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyServiceImpl.java

@@ -263,31 +263,27 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (pageNum == null || pageNum == "") {
             pageNum = "1";
         }
-        if (date != "") {
-            date = date + " 00:00:00";
-        }
-
 
         QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
-        queryWrapper.between(StringUtils.isNotBlank(date),"accept_time", date,paramsMap.get("date")+" 23:59:59")
+        queryWrapper.between(StringUtils.isNotBlank(date),"create_time", date+" 00:00:00",date+" 23:59:59")
                 .like(StringUtils.isNotBlank(userName),"farmer_name", userName);
 
         if (Integer.parseInt(type) == 7) {
-            queryWrapper.eq("is_pay", 1).orderByDesc("accept_time");
+            queryWrapper.eq("is_pay", 1).orderByDesc("create_time");
             Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
         }
         if (Integer.parseInt(type) == 6) {
-            queryWrapper.eq("is_pay", 2).orderByDesc("accept_time");
+            queryWrapper.eq("is_pay", 2).orderByDesc("create_time");
             Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
         }
         if (Integer.parseInt(type) == 3) {
-            queryWrapper.in("is_pay", 0,1).eq("subsidy_sch",3).orderByDesc("accept_time");
+            queryWrapper.in("is_pay", 0,1).eq("subsidy_sch",3).orderByDesc("create_time");
             Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
         }
-        queryWrapper.eq(StringUtils.isNotBlank(type),"subsidy_sch",type).orderByDesc("accept_time");
+        queryWrapper.eq(StringUtils.isNotBlank(type),"subsidy_sch",type).orderByDesc("create_time");
         Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
     }