Merge remote-tracking branch 'origin/master'

src/main/java/com/imed/costaccount/service/RoleService.java

@@ -29,10 +29,10 @@ public interface RoleService extends IService<Role> {
      * @param pageSize 每页展示数据条数
      * @param keyword 模糊匹配关键字
      * @param user 当前登录用户
-     * @param modifyTime
+     * @param startDate
      * @return {@link PageUtils} 分页对象
      */
-    PageUtils selectList(Integer page, Integer pageSize, String keyword, User user, String modifyTime);
+    PageUtils selectList(Integer page, Integer pageSize, String keyword, User user,String startDate,String endDate);
 
     /**
      * 编辑某个角色

src/main/java/com/imed/costaccount/service/impl/RoleServiceImpl.java

@@ -60,17 +60,16 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
      * @param pageSize   每页展示数据条数
      * @param keyword    模糊匹配关键字
      * @param user       当前登录用户
-     * @param modifyTime
      * @return {@link PageUtils} 分页对象
      */
     @Override
-    public PageUtils selectList(Integer page, Integer pageSize, String keyword, User user, String modifyTime) {
+    public PageUtils selectList(Integer page, Integer pageSize, String keyword, User user, String startDate,String endDate) {
         long startTime=0L;
         long endTime=0L;
-        if (StrUtil.isNotBlank(modifyTime)){
-            DateTime modifyDate = DateUtil.parseDate(modifyTime);
-            startTime = DateUtil.beginOfDay(modifyDate).getTime();
-            endTime = DateUtil.endOfDay(modifyDate).getTime();
+        if (StrUtil.isNotBlank(startDate) && StrUtil.isNotBlank(endDate)){
+            DateTime startDateTime = DateUtil.parseDate(startDate);
+            startTime = DateUtil.beginOfDay(startDateTime).getTime();
+            endTime = DateUtil.endOfDay(DateUtil.parseDate(endDate)).getTime();
         }
 
         Page<Role> rolePage = new Page<>(page, pageSize);
@@ -79,7 +78,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
                         .and(StrUtil.isNotBlank(keyword), i -> i.eq(Role::getRoleName, keyword)
                                 .or()
                                 .eq(Role::getRemark, keyword))
-                        .between(StrUtil.isNotBlank(modifyTime), Role::getCreateTime, startTime, endTime)
+                        .between((StrUtil.isNotBlank(startDate) && StrUtil.isNotBlank(endDate)), Role::getCreateTime, startTime, endTime)
         );
         List<Role> records = pages.getRecords();
         List<RoleVO> list = records.stream().map(i -> {

src/main/java/com/imed/costaccount/web/RoleController.java

@@ -48,8 +48,10 @@ public class RoleController extends AbstractController {
     public Result list(@RequestParam(defaultValue = "1", value = "current") Integer page,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "roleName", required = false) String keyword,
-                       @RequestParam(value = "modifyTime", required = false) String modifyTime) {
-        PageUtils pageUtils = roleService.selectList(page, pageSize, keyword, getUser(),modifyTime);
+                       @RequestParam(value = "startDate", required = false) String startDate,
+                       @RequestParam(value = "endDate", required = false) String endDate
+                       ) {
+        PageUtils pageUtils = roleService.selectList(page, pageSize, keyword, getUser(),startDate,endDate);
         return Result.ok(pageUtils);
     }