From 20a142626ecf54035a0cff66b0704739891a6fc9 Mon Sep 17 00:00:00 2001 From: haha Date: Fri, 29 Sep 2023 00:24:15 +0800 Subject: [PATCH] update code --- .../project/attendance/attendanceDrawer.vue | 58 +++ .../src/views/project/attendance/index.vue | 33 +- .../attendanceConfigDialog.vue | 226 +++++++++ .../attendanceConfigDrawer.vue | 4 +- .../views/project/attendanceConfig/index.vue | 192 +------ .../attendanceWorkerDrawer.vue | 59 +++ .../views/project/attendanceWorker/index.vue | 467 ++++-------------- .../src/views/project/surProject/index.vue | 29 +- .../domain/SurProjectAttendanceData.java | 10 + .../domain/SurProjectAttendanceUser.java | 28 ++ .../SurProjectAttendanceUserMapper.xml | 10 +- 11 files changed, 557 insertions(+), 559 deletions(-) create mode 100644 ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue create mode 100644 ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue create mode 100644 ruoyi-ui/src/views/project/attendanceWorker/attendanceWorkerDrawer.vue diff --git a/ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue b/ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue new file mode 100644 index 00000000..89f02a44 --- /dev/null +++ b/ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue index 5e102563..57e93828 100644 --- a/ruoyi-ui/src/views/project/attendance/index.vue +++ b/ruoyi-ui/src/views/project/attendance/index.vue @@ -2,7 +2,7 @@
- + @@ -20,7 +20,7 @@ 搜索 重置 - 设置 @@ -49,7 +49,7 @@ - + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/attendanceWorker/index.vue b/ruoyi-ui/src/views/project/attendanceWorker/index.vue index d49a78a8..39f6b7e8 100644 --- a/ruoyi-ui/src/views/project/attendanceWorker/index.vue +++ b/ruoyi-ui/src/views/project/attendanceWorker/index.vue @@ -1,109 +1,35 @@ @@ -788,6 +801,8 @@ import videoConfigDrawer from "@/views/video/videoConfig/videoConfigDrawer"; import costOutputDrawer from "@/views/project/costOutput/costOutputDrawer.vue"; import checkDetectionDrawer from "../checkDetection/checkDetectionDrawer.vue"; import standardDrawer from '@/views/project/projectStandard/projectStandardDrawer.vue' +import attendanceDataDrawer from '@/views/project/attendance/attendanceDrawer.vue' +import attendanceWorkerDrawer from '@/views/project/attendanceWorker/attendanceWorkerDrawer.vue' import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数 export default { @@ -810,7 +825,9 @@ export default { videoConfigDrawer, costOutputDrawer, checkDetectionDrawer, - standardDrawer + standardDrawer, + attendanceDataDrawer, + attendanceWorkerDrawer }, dicts: [ "sur_project_xmjd", @@ -1066,6 +1083,12 @@ export default { case "handleStandard": this.$refs.standard.show(row); break; + case "handleAttendanceWorker": + this.$refs.attendanceWorker.show(row); + break; + case "handleAttendanceData": + this.$refs.attendanceData.show(row); + break; default: break; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java index c8a0cd33..5bf28fe2 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java @@ -93,6 +93,16 @@ public class SurProjectAttendanceData extends BaseEntity private Long projectId; private Long subDeptId; + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + private Long deptId; private String companyTypeId; public Long getProjectId() { diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java index 025c3367..f0384fa7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java @@ -172,6 +172,34 @@ public class SurProjectAttendanceUser extends BaseEntity this.outTime = outTime; } + private Long projectId; + private Long subDeptId; + private Long deptId; + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getSubDeptId() { + return subDeptId; + } + + public void setSubDeptId(Long subDeptId) { + this.subDeptId = subDeptId; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + public static SurProjectAttendanceUser create(JSONObject json) { SurProjectAttendanceUser u=new SurProjectAttendanceUser(); u.workerId=json.getLong("workerId"); diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml index 7d0a8a7b..9c792896 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml @@ -44,10 +44,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, cfgid, vendors_code, workerId, laborWorkerId, workerCategory, qrCode, name, ethnic, nativePlace, gender, birthDate, phone, degreeName, photo, recentPhoto, groupId, groupName, leader, workTypeCode, workTypeName, specWorkType, hatCode, state, enterDate, exitDate, companyId, companyName, vendorId, teamId, teamName, enterType, other, remark, is_del, create_by, create_time, update_by, update_time from sur_project_attendance_user + SELECT * FROM ( + SELECT a.*,b.project_id,b.sub_dept_id + FROM sur_project_attendance_user a,sur_project_attendance_cfg b + WHERE a.cfgid=b.id ) + sur_project_attendance_user