From 96caabab434f972aeb03b5c0fbf7391f52b52706 Mon Sep 17 00:00:00 2001
From: wuzhen <52326163@qq.com>
Date: Thu, 14 Aug 2025 14:20:38 +0800
Subject: [PATCH] wuzhen update

---
 backend/pom.xml                                           | 7 +++++++
 backend/ruoyi-admin/pom.xml                               | 4 ++--
 backend/ruoyi-modules/pom.xml                             | 2 +-
 .../zsjy/controller/ZsjyInternshipDailyController.java    | 8 ++++----
 .../zsjy/service/impl/ZsjyInternshipDailyServiceImpl.java | 2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 950c890a..66e4440d 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -407,6 +407,13 @@
                 <version>${revision}</version>
             </dependency>
 
+            <!--  招生就业管理模块  -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-zsjy</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <!--  社团管理模块  -->
             <!-- <dependency>
                 <groupId>org.dromara</groupId>
diff --git a/backend/ruoyi-admin/pom.xml b/backend/ruoyi-admin/pom.xml
index 7b0be823..3817f9f5 100644
--- a/backend/ruoyi-admin/pom.xml
+++ b/backend/ruoyi-admin/pom.xml
@@ -119,10 +119,10 @@
             <version>${revision}</version>
         </dependency> -->
         <!--  招生就业管理模块  -->
-        <!-- <dependency>
+        <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-zsjy</artifactId>
-        </dependency> -->
+        </dependency>
         <!--  安全保卫管理模块  -->
         <dependency>
             <groupId>org.dromara</groupId>
diff --git a/backend/ruoyi-modules/pom.xml b/backend/ruoyi-modules/pom.xml
index 212e63c6..2983d764 100644
--- a/backend/ruoyi-modules/pom.xml
+++ b/backend/ruoyi-modules/pom.xml
@@ -16,7 +16,7 @@
         <module>ruoyi-workflow</module>
         <module>ruoyi-xg</module>
         <!-- <module>ruoyi-xg-xx</module> -->
-        <!-- <module>ruoyi-zsjy</module> -->
+        <module>ruoyi-zsjy</module>
         <module>ruoyi-hq</module>
         <module>ruoyi-aqbw</module>
         <module>ruoyi-cw</module>
diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java
index 2c46276b..2e39137e 100644
--- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java
+++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java
@@ -72,15 +72,15 @@ public class ZsjyInternshipDailyController extends BaseController {
      */
     @Operation(summary = "获取学生考勤日历", description = "查看指定学生的考勤日历数据")
     @SaCheckPermission("zsjy:internshipdaily:calendar")
-    @GetMapping("/calendar/{studentId}")
+    @GetMapping("/calendar")
     public R<List<Map<String, Object>>> getCalendar(
-            @Parameter(description = "学生ID", required = true) @PathVariable Long studentId,
+            @Parameter(description = "学生ID", required = true) @RequestParam Long studentId,
             @Parameter(description = "年份") @RequestParam(required = false) Integer year,
             @Parameter(description = "月份") @RequestParam(required = false) Integer month) {
 
         log.info("=== Controller层调试 ===");
-        log.info("接口被调用: /zsjy/internship/daily/calendar/{}", studentId);
-        log.info("查询年月: {}-{}", year, month);
+        log.info("接口被调用: /zsjy/internship/daily/calendar");
+        log.info("学生ID: {}, 查询年月: {}-{}", studentId, year, month);
 
         return dailyService.getCalendarData(studentId, year, month);
     }
diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/impl/ZsjyInternshipDailyServiceImpl.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/impl/ZsjyInternshipDailyServiceImpl.java
index 9f5c97db..f18eecc9 100644
--- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/impl/ZsjyInternshipDailyServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/impl/ZsjyInternshipDailyServiceImpl.java
@@ -50,7 +50,7 @@ public class ZsjyInternshipDailyServiceImpl implements IZsjyInternshipDailyServi
     public TableDataInfo<ZsjyInternshipDailyVo> queryPageList(ZsjyInternshipDailyQueryBo queryBo, PageQuery pageQuery) {
         Page<ZsjyInternshipDailyVo> page = pageQuery.build();
         List<ZsjyInternshipDailyVo> list = baseMapper.selectDailyList(page, queryBo);
-        return TableDataInfo.build(page);
+        return TableDataInfo.build(list);
     }
 
     /**