From 609379f50788fc3a2e3a72981d7536d7b1c7d754 Mon Sep 17 00:00:00 2001 From: haha Date: Mon, 13 May 2024 23:58:23 +0800 Subject: [PATCH 1/5] update code --- ruoyi-admin/src/main/resources/application.yml | 2 +- ruoyi-ui/src/views/project/attendance/index.vue | 13 ++++++++++--- .../project/SurProjectAttendanceDataMapper.xml | 1 + .../mapper/project/SurProjectStandardMapper.xml | 9 +++------ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 8cdba68b..73a50cfe 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -24,7 +24,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: prod + active: druid # 文件上传 servlet: multipart: diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue index 01549899..ef927d76 100644 --- a/ruoyi-ui/src/views/project/attendance/index.vue +++ b/ruoyi-ui/src/views/project/attendance/index.vue @@ -13,8 +13,8 @@ - - + + @@ -25,6 +25,9 @@ + + + 搜索 重置 @@ -84,7 +87,7 @@ - + @@ -176,6 +179,7 @@ export default { pageNum: 1, pageSize: 10, projectId:null, + workerName:'', deptId:null, companyTypeId:"0", attendanceTime:new Date() @@ -264,6 +268,9 @@ export default { } postData.pageNum=this.queryParams.pageNum; postData.pageSize=this.queryParams.pageSize; + if(this.queryParams.workerName){ + postData.workerName=this.queryParams.workerName; + } if(this.queryParams.companyTypeId && this.queryParams.companyTypeId>0){ postData.companyTypeId=this.queryParams.companyTypeId; } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index 6910ddfd..72edfc8b 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -132,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and vendorId = #{vendorId} and device_code = #{deviceCode} and scanPhoto like concat('%', #{scanPhoto}, '%') + and workerName like concat('%', #{workerName}, '%') and is_del = #{isDel} order by attendance_time desc diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml index 67c62c42..70ff9d9b 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml @@ -120,10 +120,7 @@ \ No newline at end of file From 717f6305248d3c0efd9e23fb38faf3a88b2de27a Mon Sep 17 00:00:00 2001 From: haha Date: Tue, 14 May 2024 00:48:13 +0800 Subject: [PATCH 3/5] update code --- .../checkDetection/checkDetectionDrawer.vue | 2 +- .../src/views/project/checkDetection/index.vue | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue index 03f1f124..9fc71de2 100644 --- a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue +++ b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue @@ -604,7 +604,7 @@ export default { }, /** 下载附件 */ handleDownload(row) { - this.files = row.measureFiles.split(","); + this.files = row.detectionFile.split(","); this.files.forEach((item) => { this.$download.resource(item); }); diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue index afef0b96..e6bc8af9 100644 --- a/ruoyi-ui/src/views/project/checkDetection/index.vue +++ b/ruoyi-ui/src/views/project/checkDetection/index.vue @@ -172,7 +172,7 @@ @@ -481,6 +481,12 @@ export default { this.getList(); }, methods: { + doDown(row){ + this.files = row.detectionFile.split(","); + this.files.forEach((item) => { + this.$download.resource(item); + }); + }, fileInput(files) { let fileUrls = ""; if (files.length > 0) { @@ -681,14 +687,7 @@ export default { } }); }); - }, - /** 下载附件 */ - handleDownload(row) { - this.files = row.measureFiles.split(","); - this.files.forEach((item) => { - this.$download.resource(item); - }); - }, + }, /** 审批日志 */ handleAuditinfo(row) { row.title = "材料取样复试"; From d1d3aa20e35d73b36da6f56c2b3972cc9b476d8e Mon Sep 17 00:00:00 2001 From: haha Date: Tue, 14 May 2024 22:05:11 +0800 Subject: [PATCH 4/5] update code --- .../src/views/project/attendance/index.vue | 23 +++++++++++++------ .../SurProjectAttendanceDataMapper.xml | 5 +++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue index ef927d76..940c9eaf 100644 --- a/ruoyi-ui/src/views/project/attendance/index.vue +++ b/ruoyi-ui/src/views/project/attendance/index.vue @@ -24,6 +24,9 @@ + - + + @@ -71,18 +74,18 @@ - + - + @@ -182,7 +185,8 @@ export default { workerName:'', deptId:null, companyTypeId:"0", - attendanceTime:new Date() + attendanceTime:new Date(), + attendanceOutTime:undefined }, // 表单参数 form: {}, @@ -255,10 +259,15 @@ export default { this.$refs.attDrawer.show(); }, /** 查询劳务实名制管理列表 */ - getList() { + getList() { this.loading = true; let postData={}; - postData.attendanceTime=this.$dt(this.queryParams.attendanceTime).format("YYYY-MM-DD"); + if(this.queryParams.attendanceTime){ + postData.attendanceTime=this.$dt(this.queryParams.attendanceTime).format("YYYY-MM-DD"); + } + if(this.queryParams.attendanceOutTime){ + postData.attendanceOutTime=this.$dt(this.queryParams.attendanceOutTime).format("YYYY-MM-DD"); + } let tmps=this.cfgList.filter(d=>d.projectId==this.queryParams.projectId && d.subDeptId==this.queryParams.deptId); if(tmps.length>0){ postData.cfgid=tmps[0].id; diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index 72edfc8b..22c64e3e 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -108,7 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and vendors_code = #{vendorsCode} and serverid = #{serverid} and workerId = #{workerId} - and ( date(attendance_time) =date(#{attendanceTime}) or date(attendance_out_time) =date(#{attendanceTime})) + + and date(attendance_out_time) <=date(#{attendanceOutTime}) + + and date(attendance_time) >= date(#{attendanceTime}) and identification = #{identification} and teamId = #{teamId} and workTypeCode = #{workTypeCode} From 076159a6d62f905ac32df27d1e36fe045df8bfd7 Mon Sep 17 00:00:00 2001 From: haha Date: Tue, 14 May 2024 22:27:56 +0800 Subject: [PATCH 5/5] update code --- ruoyi-ui/src/views/project/attendance/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue index 940c9eaf..ddc11170 100644 --- a/ruoyi-ui/src/views/project/attendance/index.vue +++ b/ruoyi-ui/src/views/project/attendance/index.vue @@ -74,7 +74,7 @@ - + - +