优化

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java

@@ -270,7 +270,8 @@ public class HardWareCallbackController {
     @ApiOperation(value = " 添加塔吊实时数据信息", notes = "添加塔吊实时数据信息", httpMethod = "POST")
     @PostMapping(value = "/towerCraneCurrentData/add")
     public Result<Object> add(@RequestBody TowerCraneCurrentData towerCraneCurrentData) {
-        TowerCrane towerCrane = towerCraneService.getById(towerCraneCurrentData.getDevId());
+        TowerCrane towerCrane = towerCraneService.getOne(Wrappers.<TowerCrane>lambdaQuery()
+                .eq(TowerCrane::getDevNumber, towerCraneCurrentData.getDevNumber()));
         if (towerCrane == null) {
             return Result.error("该设备不存在!");
         }
@@ -282,7 +283,8 @@ public class HardWareCallbackController {
     @ApiOperation(value = " 添加塔吊报警数据信息", notes = "添加塔吊报警数据信息", httpMethod = "POST")
     @PostMapping(value = "/towerCraneAlarm/add")
     public Result<Object> add(@RequestBody TowerCraneAlarm towerCraneAlarm) {
-        TowerCrane towerCrane = towerCraneService.getById(towerCraneAlarm.getDevId());
+        TowerCrane towerCrane = towerCraneService.getOne(Wrappers.<TowerCrane>lambdaQuery()
+                .eq(TowerCrane::getDevNumber, towerCraneAlarm.getDevNumber()));
         if (towerCrane == null) {
             return Result.error("该设备不存在!");
         }
@@ -294,7 +296,8 @@ public class HardWareCallbackController {
     @ApiOperation(value = " 添加塔吊工作循环数据信息", notes = "添加塔吊工作循环数据信息", httpMethod = "POST")
     @PostMapping(value = "/towerCraneWorkCycle/add")
     public Result<Object> add(@RequestBody TowerCraneWorkCycle towerCraneWorkCycle) {
-        TowerCrane towerCrane = towerCraneService.getById(towerCraneWorkCycle.getDevId());
+        TowerCrane towerCrane = towerCraneService.getOne(Wrappers.<TowerCrane>lambdaQuery()
+                .eq(TowerCrane::getDevNumber, towerCraneWorkCycle.getDevNumber()));
         if (towerCrane == null) {
             return Result.error("该设备不存在!");
         }
@@ -306,7 +309,8 @@ public class HardWareCallbackController {
     @ApiOperation(value = " 添加升降机报警信息", notes = "添加升降机报警信息", httpMethod = "POST")
     @PostMapping(value = "/lifterAlarm/add")
     public Result<Object> add(@RequestBody LifterAlarm lifterAlarm) {
-        Lifter lifter = lifterService.getById(lifterAlarm.getDevId());
+        Lifter lifter = lifterService.getOne(Wrappers.<Lifter>lambdaQuery()
+                .eq(Lifter::getDevNumber, lifterAlarm.getDevNumber()));
         if (lifter == null) {
             return Result.error("该设备不存在!");
         }
@@ -318,7 +322,8 @@ public class HardWareCallbackController {
     @ApiOperation(value = " 添加升降机实时数据信息", notes = "添加升降机实时数据信息", httpMethod = "POST")
     @PostMapping(value = "/lifterCurrentData/add")
     public Result<Object> add(@RequestBody LifterCurrentData lifterCurrentData) {
-        Lifter lifter = lifterService.getById(lifterCurrentData.getDevId());
+        Lifter lifter = lifterService.getOne(Wrappers.<Lifter>lambdaQuery()
+                .eq(Lifter::getDevNumber, lifterCurrentData.getDevNumber()));
         if (lifter == null) {
             return Result.error("该设备不存在!");
         }
@@ -330,7 +335,8 @@ public class HardWareCallbackController {
     @ApiOperation(value = " 添加升降机工作循环数据信息", notes = "添加升降机工作循环数据信息", httpMethod = "POST")
     @PostMapping(value = "/lifterWorkCycle/add")
     public Result<Object> add(@RequestBody LifterWorkCycle lifterWorkCycle) {
-        Lifter lifter = lifterService.getById(lifterWorkCycle.getDevId());
+        Lifter lifter = lifterService.getOne(Wrappers.<Lifter>lambdaQuery()
+                .eq(Lifter::getDevNumber, lifterWorkCycle.getDevNumber()));
         if (lifter == null) {
             return Result.error("该设备不存在!");
         }

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java

@@ -55,7 +55,7 @@ public class EntProgressReportRecordController {
     public Result<IPage<ProgressReportRecord>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
         QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map);
         Page page = PageUtil.getPage(map);
-        IPage<ProgressReportRecord> pageList = progressReportRecordService.page(page, queryWrapper);
+        IPage<ProgressReportRecord> pageList = progressReportRecordService.pageList(page, queryWrapper);
         return Result.success(pageList);
     }
 

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemUserController.java

@@ -57,8 +57,8 @@ public class EntSystemUserController {
            @ApiImplicitParam(name = "userTel", value = "手机号码", paramType = "body", dataType = "String"),
            @ApiImplicitParam(name = "state", value = "状态(0:停用；1:启用)", paramType = "body", dataType = "Integer"),
            @ApiImplicitParam(name = "deptId", value = "部门", paramType = "body", dataType = "String"),
-           @ApiImplicitParam(name = "beginTime", value = "开始日期", paramType = "body", dataType = "String"),
+           @ApiImplicitParam(name = "createTime_begin", value = "开始日期", paramType = "body", dataType = "String"),
-           @ApiImplicitParam(name = "endTime", value = "结束日期", paramType = "body", dataType = "String"),
+           @ApiImplicitParam(name = "createTime_end", value = "结束日期", paramType = "body", dataType = "String"),
            @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"),
            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer")
    })

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java

@@ -80,6 +80,7 @@ public class EntUnmannedDeviceController {
     public Result<IPage<UnmannedDevice>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
         QueryWrapper<UnmannedDevice> queryWrapper = QueryGenerator.initPageQueryWrapper(UnmannedDevice.class, map);
         Page<UnmannedDevice> page = PageUtil.getPage(map);
+        queryWrapper.lambda().orderByDesc(UnmannedDevice::getCreateTime);
         IPage<UnmannedDevice> pageList = unmannedDeviceService.page(page, queryWrapper);
         return Result.success(pageList);
     }

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java

@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.basicdata.controller.government;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,6 +11,7 @@ import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.jeecg.common.util.PageUtil;
+import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants;
 import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto;
 import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
 import com.zhgd.xmgl.modules.wisdom.entity.MonitorDev;
@@ -69,6 +71,9 @@ public class GovMonitorDevController {
     public Result<IPage<MonitorDev>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
         Result<IPage<MonitorDev>> result = new Result<IPage<MonitorDev>>();
         QueryWrapper<MonitorDev> queryWrapper = QueryGenerator.initPageQueryWrapper(MonitorDev.class, map);
+        if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) {
+            queryWrapper.lambda().eq(MonitorDev::getEngineeringSn, StrUtil.EMPTY);
+        }
         Page<MonitorDev> page = PageUtil.getPage(map);
         IPage<MonitorDev> pageList = monitorDevService.page(page, queryWrapper);
         result.setSuccess(true);
@@ -92,6 +97,9 @@ public class GovMonitorDevController {
     public Result<List<MonitorDev>> queryList(@ApiIgnore @RequestBody Map<String, Object> map) {
         Result<List<MonitorDev>> result = new Result<List<MonitorDev>>();
         QueryWrapper<MonitorDev> queryWrapper = QueryGenerator.initPageQueryWrapper(MonitorDev.class, map);
+        if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) {
+            queryWrapper.lambda().eq(MonitorDev::getEngineeringSn, StrUtil.EMPTY);
+        }
         List<MonitorDev> list = monitorDevService.list(queryWrapper);
         result.setSuccess(true);
         result.setResult(list);

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java

@@ -55,7 +55,7 @@ public class GovProgressReportRecordController {
     public Result<IPage<ProgressReportRecord>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
         QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map);
         Page page = PageUtil.getPage(map);
-        IPage<ProgressReportRecord> pageList = progressReportRecordService.page(page, queryWrapper);
+        IPage<ProgressReportRecord> pageList = progressReportRecordService.pageList(page, queryWrapper);
         return Result.success(pageList);
     }
 

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemUserController.java

@@ -53,8 +53,8 @@ public class GovSystemUserController {
            @ApiImplicitParam(name = "userTel", value = "手机号码", paramType = "body", dataType = "String"),
            @ApiImplicitParam(name = "state", value = "状态(0:停用；1:启用)", paramType = "body", dataType = "Integer"),
            @ApiImplicitParam(name = "deptId", value = "部门", paramType = "body", dataType = "String"),
-           @ApiImplicitParam(name = "beginTime", value = "开始日期", paramType = "body", dataType = "String"),
+           @ApiImplicitParam(name = "createTime_begin", value = "开始日期", paramType = "body", dataType = "String"),
-           @ApiImplicitParam(name = "endTime", value = "结束日期", paramType = "body", dataType = "String"),
+           @ApiImplicitParam(name = "createTime_end", value = "结束日期", paramType = "body", dataType = "String"),
            @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"),
            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer")
    })

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java

@@ -55,7 +55,7 @@ public class ProgressReportRecordController {
     public Result<IPage<ProgressReportRecord>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
         QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map);
         Page page = PageUtil.getPage(map);
-        IPage<ProgressReportRecord> pageList = progressReportRecordService.page(page, queryWrapper);
+        IPage<ProgressReportRecord> pageList = progressReportRecordService.pageList(page, queryWrapper);
         return Result.success(pageList);
     }
 

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemUserController.java

@@ -57,8 +57,8 @@ public class SystemUserController {
            @ApiImplicitParam(name = "userTel", value = "手机号码", paramType = "body", dataType = "String"),
            @ApiImplicitParam(name = "state", value = "状态(0:停用；1:启用)", paramType = "body", dataType = "Integer"),
            @ApiImplicitParam(name = "deptId", value = "部门", paramType = "body", dataType = "String"),
-           @ApiImplicitParam(name = "beginTime", value = "开始日期", paramType = "body", dataType = "String"),
+           @ApiImplicitParam(name = "createTime_begin", value = "开始日期", paramType = "body", dataType = "String"),
-           @ApiImplicitParam(name = "endTime", value = "结束日期", paramType = "body", dataType = "String"),
+           @ApiImplicitParam(name = "createTime_end", value = "结束日期", paramType = "body", dataType = "String"),
            @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"),
            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer")
    })

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/UnmannedDeviceController.java

@@ -12,7 +12,6 @@ import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants;
 import com.zhgd.xmgl.modules.safety.entity.UnmannedDevice;
 import com.zhgd.xmgl.modules.safety.service.IUnmannedDeviceService;
-import com.zhgd.xmgl.security.SecurityUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -65,6 +64,7 @@ public class UnmannedDeviceController {
             queryWrapper.lambda().eq(UnmannedDevice::getEngineeringSn, StrUtil.EMPTY);
         }
         Page<UnmannedDevice> page = PageUtil.getPage(map);
+        queryWrapper.lambda().orderByDesc(UnmannedDevice::getCreateTime);
         IPage<UnmannedDevice> pageList = unmannedDeviceService.page(page, queryWrapper);
         return Result.success(pageList);
     }

src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemRoleMenu.java

@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.basicdata.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -46,4 +47,8 @@ public class SystemRoleMenu implements Serializable {
     @Excel(name = "菜单类型,0:模块 1:菜单;2:按钮", width = 15)
     @ApiModelProperty(value = "菜单类型,0:模块 1:菜单;2:按钮")
     private Integer type;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "子集数量")
+    private Integer children = 0;
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java

@@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
-import com.zhgd.mybatis.Aes;
-import com.zhgd.xmgl.handler.exception.CustomException;
-import com.zhgd.xmgl.modules.basicdata.dto.MenuHzDto;
 import com.zhgd.xmgl.modules.basicdata.dto.MenuTreeDto;
 import com.zhgd.xmgl.modules.basicdata.entity.*;
 import com.zhgd.xmgl.modules.basicdata.mapper.BaseActionMapper;
@@ -126,8 +123,24 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
     @Override
     public List<SystemRoleMenu> roleMenu(String roleId) {
         // 查询角色下的菜单
-        return systemRoleMenuService.list(Wrappers.<SystemRoleMenu>lambdaQuery()
+        List<SystemRoleMenu> systemRoleMenus = systemRoleMenuService.list(Wrappers.<SystemRoleMenu>lambdaQuery()
                 .eq(SystemRoleMenu::getRoleId, roleId));
+        List<BaseMenu> baseMenuList = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getMenuId,
+                systemRoleMenus.stream().filter(s -> s.getType() == 1).map(s -> s.getAuthorityId()).collect(Collectors.toList())));
+        List<BaseAction> baseActionList = baseActionMapper.selectList(Wrappers.<BaseAction>lambdaQuery().in(BaseAction::getActionId,
+                systemRoleMenus.stream().filter(s -> s.getType() == 2).map(s -> s.getAuthorityId()).collect(Collectors.toList())));
+        systemRoleMenus.stream().forEach(s -> {
+            if (s.getType() == 0) {
+                s.setChildren(baseMenuList.stream().filter(b -> b.getModuleId().equals(s.getAuthorityId())).collect(Collectors.toList()).size());
+            } else if (s.getType() == 1) {
+                int number = baseMenuList.stream().filter(b -> b.getParentId().equals(s.getAuthorityId())).collect(Collectors.toList()).size();
+                if (number == 0) {
+                    number = baseActionList.stream().filter(a -> a.getMenuId().equals(s.getAuthorityId())).collect(Collectors.toList()).size();
+                }
+                s.setChildren(number);
+            }
+        });
+        return systemRoleMenus;
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java

@@ -9,8 +9,10 @@ import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.handler.exception.CustomException;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemRole;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemRoleMenu;
+import com.zhgd.xmgl.modules.basicdata.entity.SystemUserRole;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemRoleMapper;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemRoleMenuMapper;
+import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserRoleMapper;
 import com.zhgd.xmgl.modules.basicdata.service.ISystemRoleService;
 import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.security.SecurityUtil;
@@ -35,6 +37,9 @@ public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleMapper, SystemR
     @Autowired
     private SystemRoleMenuMapper systemRoleMenuMapper;
 
+    @Autowired
+    private SystemUserRoleMapper systemUserRoleMapper;
+
     @Override
     public Page<SystemRole> pageList(Map<String, Object> map) {
         SecurityUser user = SecurityUtil.getUser();
@@ -88,6 +93,7 @@ public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleMapper, SystemR
 
     @Override
     public boolean removeInfo(Long roleId) {
+        systemUserRoleMapper.delete(Wrappers.<SystemUserRole>lambdaQuery().eq(SystemUserRole::getRoleId, roleId));
         systemRoleMenuMapper.delete(Wrappers.<SystemRoleMenu>lambdaQuery().eq(SystemRoleMenu::getRoleId, roleId));
         return this.removeById(roleId);
     }

src/main/java/com/zhgd/xmgl/modules/safety/service/IProgressReportRecordService.java

@@ -1,7 +1,9 @@
 package com.zhgd.xmgl.modules.safety.service;
 
-import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord;
 
 /**
  * @Description: 工程进度上报记录
@@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProgressReportRecordService extends IService<ProgressReportRecord> {
 
+    Page<ProgressReportRecord> pageList(Page page, QueryWrapper<ProgressReportRecord> wrappers);
 }

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProgressReportRecordServiceImpl.java

@@ -1,12 +1,13 @@
 package com.zhgd.xmgl.modules.safety.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord;
 import com.zhgd.xmgl.modules.safety.mapper.ProgressReportRecordMapper;
 import com.zhgd.xmgl.modules.safety.service.IProgressReportRecordService;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 工程进度上报记录
  * @author： pengj
@@ -16,4 +17,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ProgressReportRecordServiceImpl extends ServiceImpl<ProgressReportRecordMapper, ProgressReportRecord> implements IProgressReportRecordService {
 
+    @Override
+    public Page<ProgressReportRecord> pageList(Page page, QueryWrapper<ProgressReportRecord> wrappers) {
+        wrappers.lambda().orderByDesc(ProgressReportRecord::getReportTime);
+        return baseMapper.selectPage(page, wrappers);
+    }
 }

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java

@@ -287,13 +287,7 @@ public class ProjectSubItemServiceImpl extends ServiceImpl<ProjectSubItemMapper,
                 endTime = projectSubItem.getRealEndTime();
             }
             if (DateUtil.between(projectSubItem.getPlanEndTime(), endTime, DateUnit.DAY, false) > 0){
-                if (task.getPercentageComplete().intValue() == 100 || (actualFinishDate != null && actualFinishDate.getTime() <= System.currentTimeMillis())) {
+                projectSubItem.setState(4);
-                    projectSubItem.setState(6);
-                } else  if (task.getPercentageComplete().intValue() == 0 || actualStartDate == null || actualStartDate.getTime() > System.currentTimeMillis()) {
-                    projectSubItem.setState(4);
-                } else {
-                    projectSubItem.setState(5);
-                }
             } else if (task.getPercentageComplete().intValue() == 100 || (actualFinishDate != null && actualFinishDate.getTime() <= System.currentTimeMillis())) {
                 projectSubItem.setState(3);
             } else  if (task.getPercentageComplete().intValue() == 0 || actualStartDate == null || actualStartDate.getTime() > System.currentTimeMillis()) {

src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/WorkerInfoServiceImpl.java

@@ -223,7 +223,8 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             record.put("earlyDay", attendStatList.stream().filter(a -> a.getExitState() == 2 && record.get("id").toString().equals(a.getWorkerId())).count());
             long hourTotal = attendStatList.stream().filter(a -> record.get("id").toString().equals(a.getWorkerId())).mapToLong(AttendanceStatistics::getWorkHour).sum();
             record.put("workerHour", hourTotal / 60 + "时" + hourTotal % 60 + "分");
-            for (int i = 1; i < 32; i++) {
+            int monthDay =  DateUtil.lengthOfMonth(DateUtil.month(DateUtil.parse(month, "yyyy-MM")) + 1, DateUtil.isLeapYear(DateUtil.year(DateUtil.parse(month, "yyyy-MM"))));
+            for (int i = 1; i < monthDay; i++) {
                 String time = i < 10 ? month + "-0" + i : month + "-" + i;
                 List<AttendanceStatistics> attendanceStatistics = attendStatList.stream().filter(
                         a -> a.getDayDate().equals(time)