From d3bc55ea1855ca6c3518963a96eef6a21f8d24d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Mon, 28 Jul 2025 20:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/project/domain/bo/Punchrange.java    |  6 ++++++
 .../project/domain/vo/project/BusProjectVo.java      |  6 ++++++
 .../project/service/impl/BusProjectServiceImpl.java  | 12 +++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/bo/Punchrange.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/bo/Punchrange.java
index 46296042..516c3a8b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/bo/Punchrange.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/bo/Punchrange.java
@@ -13,6 +13,12 @@ import java.io.Serializable;
 
 @Data
 public class Punchrange implements Serializable {
+    /**
+     * 项目ID
+     */
+    @NotNull(message = "项目ID不能为空")
+    private Long projectId;
+
     /**
      * 范围名称
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java
index 47208544..cab90e79 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java
@@ -7,6 +7,7 @@ import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.project.domain.BusProject;
+import org.dromara.project.domain.bo.Punchrange;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -184,4 +185,9 @@ public class BusProjectVo implements Serializable {
      */
     private List<BusSubProjectVo> children;
 
+    /**
+     * 打卡范围
+     */
+    private List<Punchrange> punchrangeList;
+
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
index 855c7d94..6d6990b5 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
@@ -151,7 +151,17 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         if (project == null) {
             throw new ServiceException("对应项目不存在", HttpStatus.NOT_FOUND);
         }
-        return this.getVo(project);
+        BusProjectVo vo = this.getVo(project);
+        //成功获取项目信息过后，还需要获取打卡范围
+        List<BusProjectPunchrange> punchrangeList = busProjectPunchrangeService.lambdaQuery()
+            .eq(BusProjectPunchrange::getProjectId, id)
+            .list();
+        if (!punchrangeList.isEmpty()) {
+            List<Punchrange> objects = new ArrayList<>();
+            BeanUtil.copyProperties(punchrangeList, objects);
+            vo.setPunchrangeList(objects);
+        }
+        return vo;
     }
 
     /**