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, "实名制人员数据"); } - - /** * 新增保存实名制人员 */