diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectReportServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectReportServiceImpl.java index cdefd88..a80a30f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectReportServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectReportServiceImpl.java @@ -114,6 +114,17 @@ public class OaProjectReportServiceImpl implements IOaProjectReportService { */ @Override public Boolean insertByBo(OaProjectReportBo bo) { + // 检查今日是否已报工 + OaProjectReportBo checkBo = new OaProjectReportBo(); + checkBo.setUserId(LoginHelper.getUserId()); + checkBo.setCreateTime(new Date()); + + QueryWrapper queryWrapper = ClearbuildQueryWrapper(checkBo); + long count = baseMapper.selectCount(queryWrapper); + if (count > 0) { + throw new RuntimeException("今日已报工,不允许重复报工"); + } + OaProjectReport add = BeanUtil.toBean(bo, OaProjectReport.class); validEntityBeforeSave(add); add.setUserId(LoginHelper.getUserId()); @@ -124,6 +135,7 @@ public class OaProjectReportServiceImpl implements IOaProjectReportService { return flag; } + /** * 修改项目报工 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportScheduleServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportScheduleServiceImpl.java index 5f8571e..959dd7e 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportScheduleServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportScheduleServiceImpl.java @@ -87,6 +87,8 @@ public class OaReportScheduleServiceImpl implements IOaReportScheduleService { lqw.eq(StringUtils.isNotBlank(bo.getAccessory()), OaReportSchedule::getAccessory, bo.getAccessory()); lqw.eq(bo.getSort() != null, OaReportSchedule::getSort, bo.getSort()); lqw.eq(bo.getStatus() != null, OaReportSchedule::getStatus, bo.getStatus()); + // 按照创建时间倒序排列 + lqw.orderByDesc(OaReportSchedule::getCreateTime); return lqw; }