From 5c54e9e1698cf53d80c4d51d25cc340b162bd48f Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 11 Oct 2025 15:14:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E4=BB=8A?=
 =?UTF-8?q?=E6=97=A5=E6=8A=A5=E5=B7=A5=E9=87=8D=E5=A4=8D=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=8E=92=E7=8F=AD=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在项目报工插入已报工前增加今日是否的检查逻辑- 若今日已存在报工记录，则抛出异常阻止重复提交
- 对排班列表查询条件增加按创建时间倒序排列功能
---
 .../oa/service/impl/OaProjectReportServiceImpl.java  | 12 ++++++++++++
 .../oa/service/impl/OaReportScheduleServiceImpl.java |  2 ++
 2 files changed, 14 insertions(+)

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<OaProjectReport> 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;
     }