From b34283a07bbdd8e5ff6fffc013a1f5e7eb68124b Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 19 Sep 2023 17:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/HardWareCallbackController.java | 18 ++++++++++------ .../EntProgressReportRecordController.java | 2 +- .../enterprise/EntSystemUserController.java | 4 ++-- .../EntUnmannedDeviceController.java | 1 + .../government/GovMonitorDevController.java | 8 +++++++ .../GovProgressReportRecordController.java | 2 +- .../government/GovSystemUserController.java | 4 ++-- .../ProgressReportRecordController.java | 2 +- .../project/SystemUserController.java | 4 ++-- .../project/UnmannedDeviceController.java | 2 +- .../basicdata/entity/SystemRoleMenu.java | 5 +++++ .../service/impl/BaseMenuServiceImpl.java | 21 +++++++++++++++---- .../service/impl/SystemRoleServiceImpl.java | 6 ++++++ .../service/IProgressReportRecordService.java | 5 ++++- .../impl/ProgressReportRecordServiceImpl.java | 10 +++++++-- .../impl/ProjectSubItemServiceImpl.java | 8 +------ .../service/impl/WorkerInfoServiceImpl.java | 3 ++- 17 files changed, 74 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java index 9705e4f..da54910 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java +++ b/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 add(@RequestBody TowerCraneCurrentData towerCraneCurrentData) { - TowerCrane towerCrane = towerCraneService.getById(towerCraneCurrentData.getDevId()); + TowerCrane towerCrane = towerCraneService.getOne(Wrappers.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 add(@RequestBody TowerCraneAlarm towerCraneAlarm) { - TowerCrane towerCrane = towerCraneService.getById(towerCraneAlarm.getDevId()); + TowerCrane towerCrane = towerCraneService.getOne(Wrappers.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 add(@RequestBody TowerCraneWorkCycle towerCraneWorkCycle) { - TowerCrane towerCrane = towerCraneService.getById(towerCraneWorkCycle.getDevId()); + TowerCrane towerCrane = towerCraneService.getOne(Wrappers.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 add(@RequestBody LifterAlarm lifterAlarm) { - Lifter lifter = lifterService.getById(lifterAlarm.getDevId()); + Lifter lifter = lifterService.getOne(Wrappers.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 add(@RequestBody LifterCurrentData lifterCurrentData) { - Lifter lifter = lifterService.getById(lifterCurrentData.getDevId()); + Lifter lifter = lifterService.getOne(Wrappers.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 add(@RequestBody LifterWorkCycle lifterWorkCycle) { - Lifter lifter = lifterService.getById(lifterWorkCycle.getDevId()); + Lifter lifter = lifterService.getOne(Wrappers.lambdaQuery() + .eq(Lifter::getDevNumber, lifterWorkCycle.getDevNumber())); if (lifter == null) { return Result.error("该设备不存在!"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java index 0616451..9f14d84 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java @@ -55,7 +55,7 @@ public class EntProgressReportRecordController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map); Page page = PageUtil.getPage(map); - IPage pageList = progressReportRecordService.page(page, queryWrapper); + IPage pageList = progressReportRecordService.pageList(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemUserController.java index 9ccf45b..0c3cd3f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemUserController.java +++ b/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 = "endTime", value = "结束日期", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "createTime_begin", 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") }) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java index 97f29fc..f8d44ff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java @@ -80,6 +80,7 @@ public class EntUnmannedDeviceController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(UnmannedDevice.class, map); Page page = PageUtil.getPage(map); + queryWrapper.lambda().orderByDesc(UnmannedDevice::getCreateTime); IPage pageList = unmannedDeviceService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java index d74ec5e..9e33b0b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java +++ b/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> queryPageList(@ApiIgnore @RequestBody Map map) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(MonitorDev.class, map); + if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { + queryWrapper.lambda().eq(MonitorDev::getEngineeringSn, StrUtil.EMPTY); + } Page page = PageUtil.getPage(map); IPage pageList = monitorDevService.page(page, queryWrapper); result.setSuccess(true); @@ -92,6 +97,9 @@ public class GovMonitorDevController { public Result> queryList(@ApiIgnore @RequestBody Map map) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(MonitorDev.class, map); + if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { + queryWrapper.lambda().eq(MonitorDev::getEngineeringSn, StrUtil.EMPTY); + } List list = monitorDevService.list(queryWrapper); result.setSuccess(true); result.setResult(list); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java index cc2631b..e3137f6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java @@ -55,7 +55,7 @@ public class GovProgressReportRecordController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map); Page page = PageUtil.getPage(map); - IPage pageList = progressReportRecordService.page(page, queryWrapper); + IPage pageList = progressReportRecordService.pageList(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemUserController.java index b65d571..9b426de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemUserController.java +++ b/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 = "endTime", value = "结束日期", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "createTime_begin", 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") }) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java index 1f944fa..b6f392b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java @@ -55,7 +55,7 @@ public class ProgressReportRecordController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map); Page page = PageUtil.getPage(map); - IPage pageList = progressReportRecordService.page(page, queryWrapper); + IPage pageList = progressReportRecordService.pageList(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemUserController.java index 4d428c9..3cd2fc7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemUserController.java +++ b/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 = "endTime", value = "结束日期", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "createTime_begin", 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") }) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/UnmannedDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/UnmannedDeviceController.java index a083eff..2a49184 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/UnmannedDeviceController.java +++ b/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 page = PageUtil.getPage(map); + queryWrapper.lambda().orderByDesc(UnmannedDevice::getCreateTime); IPage pageList = unmannedDeviceService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemRoleMenu.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemRoleMenu.java index 737ef16..5b3605b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemRoleMenu.java +++ b/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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index dce11b1..9c599ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/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 i @Override public List roleMenu(String roleId) { // 查询角色下的菜单 - return systemRoleMenuService.list(Wrappers.lambdaQuery() + List systemRoleMenus = systemRoleMenuService.list(Wrappers.lambdaQuery() .eq(SystemRoleMenu::getRoleId, roleId)); + List baseMenuList = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getMenuId, + systemRoleMenus.stream().filter(s -> s.getType() == 1).map(s -> s.getAuthorityId()).collect(Collectors.toList()))); + List baseActionList = baseActionMapper.selectList(Wrappers.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 diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java index 5ed2239..8e5732d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java +++ b/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 pageList(Map map) { SecurityUser user = SecurityUtil.getUser(); @@ -88,6 +93,7 @@ public class SystemRoleServiceImpl extends ServiceImpllambdaQuery().eq(SystemUserRole::getRoleId, roleId)); systemRoleMenuMapper.delete(Wrappers.lambdaQuery().eq(SystemRoleMenu::getRoleId, roleId)); return this.removeById(roleId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IProgressReportRecordService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IProgressReportRecordService.java index 2a218d3..9d3f72f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IProgressReportRecordService.java +++ b/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 { + Page pageList(Page page, QueryWrapper wrappers); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProgressReportRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProgressReportRecordServiceImpl.java index 6e28a5a..6c44f4a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProgressReportRecordServiceImpl.java +++ b/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 implements IProgressReportRecordService { + @Override + public Page pageList(Page page, QueryWrapper wrappers) { + wrappers.lambda().orderByDesc(ProgressReportRecord::getReportTime); + return baseMapper.selectPage(page, wrappers); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java index 9d71f76..dbbdf8e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java @@ -287,13 +287,7 @@ public class ProjectSubItemServiceImpl extends ServiceImpl 0){ - if (task.getPercentageComplete().intValue() == 100 || (actualFinishDate != null && actualFinishDate.getTime() <= System.currentTimeMillis())) { - projectSubItem.setState(6); - } else if (task.getPercentageComplete().intValue() == 0 || actualStartDate == null || actualStartDate.getTime() > System.currentTimeMillis()) { - projectSubItem.setState(4); - } else { - projectSubItem.setState(5); - } + projectSubItem.setState(4); } 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()) { diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/WorkerInfoServiceImpl.java index 4b4746c..aed8741 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/WorkerInfoServiceImpl.java @@ -223,7 +223,8 @@ public class WorkerInfoServiceImpl extends ServiceImpl 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 = attendStatList.stream().filter( a -> a.getDayDate().equals(time)