wuzhen update
This commit is contained in:
1 parent
1db2f91af1
commit
96caabab43
5 files changed
+15
-8
No files matched your search
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
+4
-4
@@ -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);
|
||||
}
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user