Merge remote-tracking branch 'origin/main'

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java

@@ -190,4 +190,13 @@ public class OaProjectReportController extends BaseController {
                                                     @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate end) {
         return R.ok(iOaProjectReportService.getSummaryData(start,end));
     }
+
+    /**
+     * 查询当前登录用户今日的报工记录
+     */
+    @GetMapping("/today")
+    public R<OaProjectReportVo> getTodayReport() {
+        OaProjectReportVo todayReport = iOaProjectReportService.getTodayReportByCurrentUser();
+        return R.ok(todayReport);
+    }
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaProjectReportService.java

@@ -68,4 +68,9 @@ public interface IOaProjectReportService {
     List<OaProjectReportVo> clearList(LocalDate start, LocalDate end);
 
     List<OaProjectReportVo> getSummaryData(LocalDate start, LocalDate end);
+
+    /**
+     * 查询当前登录用户今日的报工记录
+     */
+    OaProjectReportVo getTodayReportByCurrentUser();
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectReportServiceImpl.java

@@ -95,6 +95,7 @@ public class OaProjectReportServiceImpl implements IOaProjectReportService {
     private QueryWrapper<OaProjectReport> ClearbuildQueryWrapper(OaProjectReportBo bo) {
         Map<String, Object> params = bo.getParams();
         QueryWrapper<OaProjectReport> lqw = Wrappers.query();
+        lqw.eq(bo.getUserId()!=null, "user_id", bo.getUserId());
         if (bo.getCreateTime() != null) {
             LocalDateTime start = bo.getCreateTime()            // LocalDateTime / Date 都行
                     .toInstant()
@@ -236,4 +237,20 @@ public class OaProjectReportServiceImpl implements IOaProjectReportService {
         return baseMapper.getSummaryData(start,end);
 
     }
+
+    @Override
+    public OaProjectReportVo getTodayReportByCurrentUser() {
+        // 检查今日是否已报工
+        OaProjectReportBo checkBo = new OaProjectReportBo();
+        checkBo.setUserId(LoginHelper.getUserId());
+        checkBo.setCreateTime(new Date());
+        QueryWrapper<OaProjectReport> queryWrapper = ClearbuildQueryWrapper(checkBo);
+        // 查询今日报工记录
+        OaProjectReport report = baseMapper.selectOne(queryWrapper);
+        if (report == null) {
+            return null;
+        }
+        // 转换为VO对象
+        return baseMapper.selectVoByIdPlus(report.getReportId());
+    }
 }