接口11

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

@@ -269,7 +269,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 
 
         QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
-        queryWrapper.between(StringUtils.isNotBlank(date),"sub_time", date,paramsMap.get("date")+" 23:59:59")
+        queryWrapper.between(StringUtils.isNotBlank(date),"accept_time", date,paramsMap.get("date")+" 23:59:59")
                 .like(StringUtils.isNotBlank(userName),"farmer_name", userName);
 
         if (Integer.parseInt(type) == 7) {

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

@@ -271,9 +271,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (pageNum == null || "".equals(pageNum)) {
             pageNum = "1";
         }
-        if (!"".equals(date) || date == null) {
-            date = date + " 00:00:00";
-        }
+
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         if (type==null||type=="") {
             if (role == null || role.equals("")) {
@@ -281,7 +279,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             } else {
                 queryWrapper.eq("user_type", role);
             }
-            queryWrapper.between(StringUtils.isNotBlank(date),"create_time", date,paramsMap.get("data")+" 23:59:59");
+            queryWrapper.between(StringUtils.isNotBlank(date),"create_time", date+" 00:00:00",date+" 23:59:59");
             queryWrapper.like(StringUtils.isNotBlank(word),"user_name", word)
                             .or().like(StringUtils.isNotBlank(word),"phone", word)
                             .or().like(StringUtils.isNotBlank(word),"id_card", word);
@@ -293,7 +291,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 queryWrapper.eq("user_type", type);
             }
             queryWrapper.eq("accout_type", 0)
-                    .between(StringUtils.isNotBlank(date),"create_time", date,paramsMap.get("data")+" 23:59:59")
+                    .between(StringUtils.isNotBlank(date),"create_time", date+" 00:00:00",date+" 23:59:59")
                     .eq(StringUtils.isNotBlank(role),"user_type", role).
                     like(StringUtils.isNotBlank(word),"user_name", word)
                     .or().like(StringUtils.isNotBlank(word),"phone", word)
@@ -305,7 +303,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 queryWrapper.eq("user_type", type);
             }
             queryWrapper.ge("accout_type", 1)
-                    .between(StringUtils.isNotBlank(date),"create_time",date,paramsMap.get("data")+" 23:59:59")
+                    .between(StringUtils.isNotBlank(date),"create_time",date+" 00:00:00",date+" 23:59:59")
                     .eq(StringUtils.isNotBlank(role),"user_type", role)
                     .like(StringUtils.isNotBlank(word),"user_name", word)
                     .or().like(StringUtils.isNotBlank(word),"phone", word)