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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+