wwh 2 роки тому
батько
коміт
b0bfd6fc79

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

@@ -273,21 +273,21 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
                 .like(StringUtils.isNotBlank(userName),"farmer_name", userName);
 
         if (Integer.parseInt(type) == 7) {
-            queryWrapper.eq("is_pay", 1).orderByAsc("accept_time");
+            queryWrapper.eq("is_pay", 1).orderByDesc("accept_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).orderByAsc("accept_time");
+            queryWrapper.eq("is_pay", 2).orderByDesc("accept_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).orderByAsc("accept_time");
+            queryWrapper.in("is_pay", 0,1).eq("subsidy_sch",3).orderByDesc("accept_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).orderByAsc("accept_time");
+        queryWrapper.eq(StringUtils.isNotBlank(type),"subsidy_sch",type).orderByDesc("accept_time");
         Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
     }