From 137f438a2ec44f82b320c142825204320af3a408 Mon Sep 17 00:00:00 2001 From: lijun Date: Sun, 27 Oct 2024 16:51:29 +0800 Subject: [PATCH 1/2] update code --- .../SurProjectAttendanceCfgController.java | 7 +++++++ .../SurProjectAttendanceUserController.java | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceCfgController.java b/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceCfgController.java index c50f09a..6cef83a 100644 --- a/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceCfgController.java +++ b/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceCfgController.java @@ -36,6 +36,13 @@ public class SurProjectAttendanceCfgController extends BaseController return prefix + "/attendanceCfg"; } + @GetMapping("/findAttendanceCfgList") + @ResponseBody + public AjaxResult findAttendanceCfgList(SurProjectAttendanceCfg surProjectAttendanceCfg) + { + List list = surProjectAttendanceCfgService.selectSurProjectAttendanceCfgList(surProjectAttendanceCfg); + return AjaxResult.success(list); + } /** * 查询考勤配置列表 */ diff --git a/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceUserController.java b/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceUserController.java index 0b13415..0016df4 100644 --- a/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceUserController.java +++ b/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceUserController.java @@ -40,6 +40,23 @@ public class SurProjectAttendanceUserController extends BaseController return prefix + "/attendanceUser"; } + @GetMapping("/query") + @ResponseBody + public TableDataInfo query(SurProjectAttendanceUser surProjectAttendanceUser) + { + startPage(); + List list = surProjectAttendanceUserService.querySurProjectAttendanceUserList(surProjectAttendanceUser); + return getDataTable(list); + } + + @GetMapping("/listjgw") + @ResponseBody + public TableDataInfo listjgw(SurProjectAttendanceUser surProjectAttendanceUser) + { + startPage(); + List list = surProjectAttendanceUserService.selectSurProjectAttendanceUserListJgw(surProjectAttendanceUser); + return getDataTable(list); + } /** * 查询实名制人员列表 */ From d25d22a6d52d44a64c603bdd1ca27ca57aba25af Mon Sep 17 00:00:00 2001 From: lijun Date: Sun, 27 Oct 2024 19:22:27 +0800 Subject: [PATCH 2/2] update code --- .../SurProjectAttendanceDataController.java | 16 ++++++++++++++++ .../SurProjectAttendanceUserController.java | 2 -- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceDataController.java b/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceDataController.java index dda0693..361f68e 100644 --- a/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceDataController.java +++ b/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceDataController.java @@ -1,6 +1,9 @@ package com.yanzhu.xd.system.controller; import java.util.List; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -40,6 +43,19 @@ public class SurProjectAttendanceDataController extends BaseController return prefix + "/attendanceData"; } + @GetMapping("/listEx") + @ResponseBody + public TableDataInfo listEx(SurProjectAttendanceData surProjectAttendanceData) + { + startPage(); + String tmp=surProjectAttendanceData.getAttendanceTime(); + if(StrUtil.isNotEmpty(tmp)){ + int year= DateUtil.parse(tmp).year(); + surProjectAttendanceData.setYear(year); + } + List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(surProjectAttendanceData); + return getDataTable(list); + } /** * 查询考勤数据列表 */ diff --git a/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceUserController.java b/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceUserController.java index 0016df4..4cb8925 100644 --- a/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceUserController.java +++ b/ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceUserController.java @@ -84,8 +84,6 @@ public class SurProjectAttendanceUserController extends BaseController return util.exportExcel(list, "实名制人员数据"); } - - /** * 新增保存实名制人员 */