接口121

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

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

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

@@ -276,28 +276,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         if (type==null||type=="") {
-            queryWrapper.ge(StringUtils.isNotBlank(date),"create_time", date)
+            queryWrapper.between(StringUtils.isNotBlank(date),"create_time", date,date+" 23:59:59")
                     .in("user_type", 0,1,4);
             queryWrapper.like(StringUtils.isNotBlank(word),"user_name", word)
-                            .like(StringUtils.isNotBlank(word),"phone", word)
-                            .like(StringUtils.isNotBlank(word),"id_card", word);
+                            .or().like(StringUtils.isNotBlank(word),"phone", word)
+                            .or().like(StringUtils.isNotBlank(word),"id_card", word);
             queryWrapper.orderByDesc("create_time");
         } else if (Integer.parseInt(type)==1) { //待审核
             queryWrapper.eq("accout_type", 0)
                     .in("user_type", 0,1,4)
-                    .ge(StringUtils.isNotBlank(date),"create_time", date)
+                    .between(StringUtils.isNotBlank(date),"create_time", date,date+" 23:59:59")
                     .eq(StringUtils.isNotBlank(role),"user_type", role).
-                    like(StringUtils.isNotBlank(word),"user_name", word).
-                    like(StringUtils.isNotBlank(word),"phone", word)
-                    .like(StringUtils.isNotBlank(word),"id_card", word);
+                    like(StringUtils.isNotBlank(word),"user_name", word)
+                    .or().like(StringUtils.isNotBlank(word),"phone", word)
+                    .or().like(StringUtils.isNotBlank(word),"id_card", word);
         } else {
             queryWrapper.ge("accout_type", 1)
-                    .ge(StringUtils.isNotBlank(date),"create_time", date)
+                    .between(StringUtils.isNotBlank(date),"create_time",date,date+" 23:59:59")
                     .in("user_type", 0,1,4)
                     .eq(StringUtils.isNotBlank(role),"user_type", role)
                     .like(StringUtils.isNotBlank(word),"user_name", word)
-                    .like(StringUtils.isNotBlank(word),"phone", word)
-                    .like(StringUtils.isNotBlank(word),"id_card", word);
+                    .or().like(StringUtils.isNotBlank(word),"phone", word)
+                    .or().like(StringUtils.isNotBlank(word),"id_card", word);
         }
         Page<SysUser> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, userMapper.selectPage(page, queryWrapper));