From 7976f3018e28da44905238701fd4ab93a62c23b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 19 Apr 2024 22:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/publics.js                   |  9 +++++++++
 .../src/views/project/attendance/index.vue    |  7 +++----
 .../views/project/attendanceWorker/index.vue  |  7 +++----
 .../src/views/project/surProject/index.vue    | 20 -------------------
 .../yanzhu/jh/publics/PublicsController.java  | 12 ++++++++++-
 5 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/ruoyi-ui/src/api/publics.js b/ruoyi-ui/src/api/publics.js
index 114c0e52..88c3157d 100644
--- a/ruoyi-ui/src/api/publics.js
+++ b/ruoyi-ui/src/api/publics.js
@@ -77,6 +77,14 @@ const selectProjectAuditinfo = (query) => {
     })
 }
 
+const findAttendanceCfgList = (query) =>{
+    return request({
+        url: '/publics/findAttendanceCfgList',
+        method: 'get',
+        params: query
+      })
+}
+
 export function findMyTask(){
     return request({
       url: '/publics/findTask',
@@ -95,5 +103,6 @@ export default{
     selectProjectAllUnitUser,
     selectProjectUnitUser,
     selectProjectAuditinfo,
+    findAttendanceCfgList
 }
 
diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue
index 0ef04ac1..ab04fdb1 100644
--- a/ruoyi-ui/src/views/project/attendance/index.vue
+++ b/ruoyi-ui/src/views/project/attendance/index.vue
@@ -144,7 +144,6 @@
 <script>
 import { listAttendance, getAttendance, delAttendance, addAttendance, updateAttendance } from "@/api/project/attendance";
 import { listAttendanceWorker, getAttendanceWorker, delAttendanceWorker, addAttendanceWorker, updateAttendanceWorker, queryAttendanceData } from "@/api/project/attendanceWorker";
-import {listAttendanceConfig} from '@/api/project/attendanceConfig.js'
 import attConfigDrawer from '../attendanceConfig/attendanceConfigDrawer.vue'
 export default {
   name: "Attendance",
@@ -203,10 +202,10 @@ export default {
   created() {    
     this.$api.publics.getMyProjectList({}).then((response) => {
       this.projectOptions = response.rows;    
-    });    
-    listAttendanceConfig({pageNum:1,pageSize:100}).then(d=>{
-      this.cfgList=d.rows||[];
     });
+    this.$api.publics.findAttendanceCfgList({}).then((response) => {
+      this.cfgList = response.data||[];    
+    });   
   },
   methods: {
     init(prj){
diff --git a/ruoyi-ui/src/views/project/attendanceWorker/index.vue b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
index b77337e7..91c36c5f 100644
--- a/ruoyi-ui/src/views/project/attendanceWorker/index.vue
+++ b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
@@ -95,7 +95,6 @@
 
 <script>
 import { queryAttendanceWorker, listJgwAttendanceWorker, getAttendanceWorker, delAttendanceWorker, addAttendanceWorker, updateAttendanceWorker, queryAttendanceData } from "@/api/project/attendanceWorker";
-import { listAttendanceConfig } from '@/api/project/attendanceConfig.js'
 export default {
   name: "AttendanceWorker",
   data() {
@@ -143,9 +142,9 @@ export default {
     this.$api.publics.getMyProjectList({}).then((response) => {
       this.projectOptions = response.rows;
     });
-    listAttendanceConfig({ pageNum: 1, pageSize: 100 }).then(d => {
-      this.cfgList = d.rows || [];
-    });
+    this.$api.publics.findAttendanceCfgList({}).then((response) => {
+      this.cfgList = response.data||[];
+    }); 
   },
   methods: {
     initMe(prj) {
diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue
index a770502f..ff6281b3 100644
--- a/ruoyi-ui/src/views/project/surProject/index.vue
+++ b/ruoyi-ui/src/views/project/surProject/index.vue
@@ -188,16 +188,8 @@
                 v-hasPermi="['project:projectMeasure:list']">实测实量管理</el-dropdown-item>
               <el-dropdown-item command="handleProjectMaterialSeal" icon="el-icon-s-ticket"
                 v-hasPermi="['project:materialSeal:list']">材料封样管理</el-dropdown-item>
-              <el-dropdown-item command="handleProjectDeptWroks" icon="el-icon-s-custom"
-                v-hasPermi="['project:projectDeptWroks:list']">在岗人员管理</el-dropdown-item>
               <el-dropdown-item command="handleAttendanceData" icon="el-icon-s-grid"
                 v-hasPermi="['project:attendance:list']">劳务实名管理</el-dropdown-item>
-              <!-- <el-dropdown-item
-                command="handleProjectAttendance"
-                icon="el-icon-trophy"
-                v-hasPermi="['project:surProjectAttendance:add']"
-                >今日出勤</el-dropdown-item
-              > -->
               <el-dropdown-item command="handleVideoConfig" icon="el-icon-video-camera-solid"
                 v-hasPermi="['video:videoConfig:list']">视频配置</el-dropdown-item>
               <el-dropdown-item command="handleAiBoxVideoConfig" icon="el-icon-camera"
@@ -386,8 +378,6 @@
     <workTrainDrawer ref="workTrainDrawer"></workTrainDrawer>
     <emergencyDrillDrawer ref="emergencyDrillDrawer"></emergencyDrillDrawer>
     <surProjectSpecialDrawer ref="projectSpecial"></surProjectSpecialDrawer>
-    <attendance-drawer ref="attDrawer"></attendance-drawer>
-    <projectDeptWroksDrawer ref="deptWroksDrawer"></projectDeptWroksDrawer>
     <insuranceDrawer ref="insurance"></insuranceDrawer>
     <projectCheckingDrawer ref="projectChecking"></projectCheckingDrawer>
     <materialSealDrawer ref="materialSeal"></materialSealDrawer>
@@ -422,8 +412,6 @@ import buildNodeDrawer from "../surBuildNode/buildNodeDrawer.vue";
 import workTrainDrawer from "../../work/workTrain/workTrainDrawer.vue";
 import emergencyDrillDrawer from "../../work/emergencyDrill/emergencyDrillDrawer.vue";
 import surProjectSpecialDrawer from "../surProjectSpecial/surProjectSpecialDrawer.vue";
-import attendanceDrawer from "../surProjectAttendance/attendanceDrawer.vue";
-import projectDeptWroksDrawer from "../projectDeptWroks/projectDeptWroksDrawer.vue";
 import insuranceDrawer from "../surProjectInsurance/insuranceDrawer.vue";
 import projectCheckingDrawer from "../projectChecking/projectCheckingDrawer.vue";
 import materialSealDrawer from "@/views/project/materialSeal/projectMaterialSealDrawer.vue";
@@ -442,7 +430,6 @@ import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函
 export default {
   name: "SurProject",
   components: {
-    attendanceDrawer,
     ProjectScheduleDlg,
     projectUserInfoDrawer,
     BaiduMap,
@@ -451,7 +438,6 @@ export default {
     workTrainDrawer,
     emergencyDrillDrawer,
     surProjectSpecialDrawer,
-    projectDeptWroksDrawer,
     insuranceDrawer,
     projectCheckingDrawer,
     materialSealDrawer,
@@ -693,12 +679,6 @@ export default {
         case "handleProjectSpecial":
           this.$refs.projectSpecial.show(row);
           break;
-        case "handleProjectDeptWroks":
-          this.$refs.deptWroksDrawer.show(row);
-          break;
-        case "handleProjectAttendance":
-          this.$refs.attDrawer.show(row);
-          break;
         case "handleProjectInsurance":
           this.$refs.insurance.show(row);
           break;
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java
index 5eb0e53e..a4de8b8d 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java
@@ -226,10 +226,20 @@ PublicsController extends BaseController {
     @Autowired
     private ISurProjectAttendanceDataService surProjectAttendanceDataService;
 
+    /**
+     * 查询项目考勤配置列表
+     */
+    @GetMapping("/findAttendanceCfgList")
+    public AjaxResult list(SurProjectAttendanceCfg surProjectAttendanceCfg)
+    {
+        List<SurProjectAttendanceCfg> list = surProjectAttendanceCfgService.selectSurProjectAttendanceCfgList(surProjectAttendanceCfg);
+        return success(list);
+    }
+
     /**
      * 查询代办任务
      */
-    @GetMapping("/v1/initAttendanceData")
+    //@GetMapping("/v1/initAttendanceData")
     public AjaxResult initAttendanceData()
     {
         //开始时间