Merge branch 'main' of http://62.234.3.186:3000/mkl/mkl_cas_ja

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<SurProjectAttendanceCfg> list = surProjectAttendanceCfgService.selectSurProjectAttendanceCfgList(surProjectAttendanceCfg);
+        return AjaxResult.success(list);
+    }
     /**
      * 查询考勤配置列表
      */

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<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(surProjectAttendanceData);
+        return getDataTable(list);
+    }
     /**
      * 查询考勤数据列表
      */

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<SurProjectAttendanceUser> list = surProjectAttendanceUserService.querySurProjectAttendanceUserList(surProjectAttendanceUser);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/listjgw")
+    @ResponseBody
+    public TableDataInfo listjgw(SurProjectAttendanceUser surProjectAttendanceUser)
+    {
+        startPage();
+        List<SurProjectAttendanceUser> list = surProjectAttendanceUserService.selectSurProjectAttendanceUserListJgw(surProjectAttendanceUser);
+        return getDataTable(list);
+    }
     /**
      * 查询实名制人员列表
      */
@@ -67,8 +84,6 @@ public class SurProjectAttendanceUserController extends BaseController
         return util.exportExcel(list, "实名制人员数据");
     }
 
-
-
     /**
      * 新增保存实名制人员
      */