From 97a20c735040a01cf73a4daa96e6f40fb47d4347 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 24 Sep 2023 18:35:52 +0800 Subject: [PATCH] update code --- .../common/utils/file/FileUploadUtils.java | 2 +- .../mapper/flowable/FlowBusinessKeyMapper.xml | 2 +- ruoyi-ui/src/api/project/attendance.js | 44 ++ ruoyi-ui/src/api/project/attendanceConfig.js | 44 ++ ruoyi-ui/src/api/project/attendanceWorker.js | 44 ++ .../src/views/project/attendance/index.vue | 347 ++++++++++ .../views/project/attendanceConfig/index.vue | 330 +++++++++ .../views/project/attendanceWorker/index.vue | 650 ++++++++++++++++++ .../projectStandard/projectStandardDlg.vue | 8 +- .../projectStandard/projectStandardDrawer.vue | 113 +-- .../SurProjectAttendanceCfgController.java | 104 +++ .../SurProjectAttendanceDataController.java | 104 +++ .../SurProjectAttendanceUserController.java | 104 +++ .../domain/SurProjectAttendanceCfg.java | 140 ++++ .../domain/SurProjectAttendanceData.java | 168 +++++ .../domain/SurProjectAttendanceUser.java | 476 +++++++++++++ .../mapper/SurProjectAttendanceCfgMapper.java | 61 ++ .../SurProjectAttendanceDataMapper.java | 61 ++ .../SurProjectAttendanceUserMapper.java | 61 ++ .../ISurProjectAttendanceCfgService.java | 61 ++ .../ISurProjectAttendanceDataService.java | 61 ++ .../ISurProjectAttendanceUserService.java | 61 ++ .../SurProjectAttendanceCfgServiceImpl.java | 98 +++ .../SurProjectAttendanceDataServiceImpl.java | 98 +++ .../SurProjectAttendanceUserServiceImpl.java | 98 +++ .../jh/project/task/AttendanceTask.java | 107 +++ .../jh/project/task/AttendanceWorkTask.java | 10 - .../project/SurProjectAttendanceCfgMapper.xml | 106 +++ .../SurProjectAttendanceDataMapper.xml | 116 ++++ .../SurProjectAttendanceUserMapper.xml | 226 ++++++ 30 files changed, 3844 insertions(+), 61 deletions(-) create mode 100644 ruoyi-ui/src/api/project/attendance.js create mode 100644 ruoyi-ui/src/api/project/attendanceConfig.js create mode 100644 ruoyi-ui/src/api/project/attendanceWorker.js create mode 100644 ruoyi-ui/src/views/project/attendance/index.vue create mode 100644 ruoyi-ui/src/views/project/attendanceConfig/index.vue create mode 100644 ruoyi-ui/src/views/project/attendanceWorker/index.vue create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceCfgController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceDataController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUserController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceCfg.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceCfgMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceCfgService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceCfgServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java delete mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceWorkTask.java create mode 100644 yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceCfgMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java index b54dd6cb..f61c3c38 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java @@ -30,7 +30,7 @@ public class FileUploadUtils /** * 默认大小 50M */ - public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024; + public static final long DEFAULT_MAX_SIZE = 100 * 1024 * 1024; /** * 默认的文件名最大长度 100 diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml index 10352fdf..b6703fdb 100644 --- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml @@ -141,7 +141,7 @@ SELECT *,'子公司' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '工程%' and businessDeptId=#{deployId} and businessKey=#{businessKey} - ) a WHERE businessDeptId=113 AND businessKey + ) a GROUP BY cat diff --git a/ruoyi-ui/src/api/project/attendance.js b/ruoyi-ui/src/api/project/attendance.js new file mode 100644 index 00000000..7c4ff9a7 --- /dev/null +++ b/ruoyi-ui/src/api/project/attendance.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询劳务实名制管理列表 +export function listAttendance(query) { + return request({ + url: '/project/attendance/list', + method: 'get', + params: query + }) +} + +// 查询劳务实名制管理详细 +export function getAttendance(id) { + return request({ + url: '/project/attendance/' + id, + method: 'get' + }) +} + +// 新增劳务实名制管理 +export function addAttendance(data) { + return request({ + url: '/project/attendance', + method: 'post', + data: data + }) +} + +// 修改劳务实名制管理 +export function updateAttendance(data) { + return request({ + url: '/project/attendance', + method: 'put', + data: data + }) +} + +// 删除劳务实名制管理 +export function delAttendance(id) { + return request({ + url: '/project/attendance/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/project/attendanceConfig.js b/ruoyi-ui/src/api/project/attendanceConfig.js new file mode 100644 index 00000000..30051808 --- /dev/null +++ b/ruoyi-ui/src/api/project/attendanceConfig.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询项目考勤配置列表 +export function listAttendanceConfig(query) { + return request({ + url: '/project/attendanceConfig/list', + method: 'get', + params: query + }) +} + +// 查询项目考勤配置详细 +export function getAttendanceConfig(id) { + return request({ + url: '/project/attendanceConfig/' + id, + method: 'get' + }) +} + +// 新增项目考勤配置 +export function addAttendanceConfig(data) { + return request({ + url: '/project/attendanceConfig', + method: 'post', + data: data + }) +} + +// 修改项目考勤配置 +export function updateAttendanceConfig(data) { + return request({ + url: '/project/attendanceConfig', + method: 'put', + data: data + }) +} + +// 删除项目考勤配置 +export function delAttendanceConfig(id) { + return request({ + url: '/project/attendanceConfig/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/project/attendanceWorker.js b/ruoyi-ui/src/api/project/attendanceWorker.js new file mode 100644 index 00000000..c68aef86 --- /dev/null +++ b/ruoyi-ui/src/api/project/attendanceWorker.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询考勤人员基本属性列表 +export function listAttendanceWorker(query) { + return request({ + url: '/project/attendanceWorker/list', + method: 'get', + params: query + }) +} + +// 查询考勤人员基本属性详细 +export function getAttendanceWorker(id) { + return request({ + url: '/project/attendanceWorker/' + id, + method: 'get' + }) +} + +// 新增考勤人员基本属性 +export function addAttendanceWorker(data) { + return request({ + url: '/project/attendanceWorker', + method: 'post', + data: data + }) +} + +// 修改考勤人员基本属性 +export function updateAttendanceWorker(data) { + return request({ + url: '/project/attendanceWorker', + method: 'put', + data: data + }) +} + +// 删除考勤人员基本属性 +export function delAttendanceWorker(id) { + return request({ + url: '/project/attendanceWorker/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue new file mode 100644 index 00000000..daf1a58a --- /dev/null +++ b/ruoyi-ui/src/views/project/attendance/index.vue @@ -0,0 +1,347 @@ + + + diff --git a/ruoyi-ui/src/views/project/attendanceConfig/index.vue b/ruoyi-ui/src/views/project/attendanceConfig/index.vue new file mode 100644 index 00000000..a8ea87e7 --- /dev/null +++ b/ruoyi-ui/src/views/project/attendanceConfig/index.vue @@ -0,0 +1,330 @@ + + + diff --git a/ruoyi-ui/src/views/project/attendanceWorker/index.vue b/ruoyi-ui/src/views/project/attendanceWorker/index.vue new file mode 100644 index 00000000..ae41662b --- /dev/null +++ b/ruoyi-ui/src/views/project/attendanceWorker/index.vue @@ -0,0 +1,650 @@ + + + diff --git a/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue b/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue index 4ff49e60..caeeeaf2 100644 --- a/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue +++ b/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue @@ -33,7 +33,7 @@ - +