From 32b5398830be10ae1c9e16f1424dab0d14e896e8 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 23 Mar 2024 01:27:13 +0800 Subject: [PATCH 1/4] update code --- .../src/views/project/attendance/index.vue | 25 +++++++++---------- .../SurProjectAttendanceDataServiceImpl.java | 5 ++-- .../SurProjectAttendanceDataMapper.xml | 4 +++ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue index 710c7b0b..b608e114 100644 --- a/ruoyi-ui/src/views/project/attendance/index.vue +++ b/ruoyi-ui/src/views/project/attendance/index.vue @@ -52,23 +52,20 @@ - + - + - + - - - - - + + @@ -223,11 +220,13 @@ export default { this.$refs.attDrawer.show(); }, /** 查询劳务实名制管理列表 */ - getList() { + getList() { this.loading = true; - let postData={...this.queryParams}; - postData.attendanceTime=this.$dt(new Date()).format("YYYY-MM-DD"); - listAttendance(this.queryParams).then(response=>{ + let postData={}; + postData.attendanceTime=this.$dt(this.queryParams.attendanceTime).format("YYYY-MM-DD"); + postData.projectId=this.queryParams.projectId; + postData.deptId=this.queryParams.subDeptId; + listAttendance(postData).then(response=>{ this.attendanceList = response.rows; this.total = response.total; this.loading = false; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index 028fde4d..0bd2734a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -160,9 +160,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc SurProjectAttendanceData where=new SurProjectAttendanceData(); where.setVendorsCode(sdata.getVendorsCode()); where.setCfgid(sdata.getCfgid()); - where.setServerid(sdata.getServerid()); - where.setServerid(sdata.getWorkerId()); - where.setAttendanceTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", DateTime.now())); + where.setWorkerId(sdata.getWorkerId()); + where.setAttendanceTime(sdata.getAttendanceTime()); List list=selectSurProjectAttendanceDataListEx(where); if(list.size()==0){ //设置考勤其它参数 diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index 528b7dc2..5ab72a14 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cfgid = #{cfgid} and app_id = #{appId} + and projectId = #{projectId} + and deptId = #{deptId} and vendors_code = #{vendorsCode} and serverid = #{serverid} and workerId = #{workerId} @@ -73,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cfgid = #{cfgid} and app_id = #{appId} + and projectId = #{projectId} + and deptId = #{deptId} and vendors_code = #{vendorsCode} and serverid = #{serverid} and workerId = #{workerId} From 9bade2237eda1a0b12bbf3c1e87b8ba483b1325e Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 23 Mar 2024 01:33:04 +0800 Subject: [PATCH 2/4] update code --- ruoyi-ui/src/views/project/attendance/index.vue | 2 +- .../service/impl/SurProjectAttendanceDataServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue index b608e114..734ce248 100644 --- a/ruoyi-ui/src/views/project/attendance/index.vue +++ b/ruoyi-ui/src/views/project/attendance/index.vue @@ -58,7 +58,7 @@ - + diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index 0bd2734a..6cf1bf0f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -199,6 +199,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc sdata.setCompanyTypeId(group.getCompanyTypeId()); //查询华筑的分组信息 if("huazhu".equals(sdata.getVendorsCode())){ + sdata.setWorkerGender(sdata.getWorkerGender()==1?0l:1l); sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型 } //查询项目部门信息 From b5110ca8e6c394add1a885f40fcba1d385b84ae1 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 23 Mar 2024 02:17:39 +0800 Subject: [PATCH 3/4] update code --- .../ProjectAttendanceController.java | 14 +++++----- .../SurProjectAttendanceDataMapper.java | 2 ++ .../ISurProjectAttendanceDataService.java | 2 ++ .../ISurProjectWorkAttendanceService.java | 3 ++ .../SurProjectAttendanceDataServiceImpl.java | 8 ++++++ .../SurProjectWorkAttendanceServiceImpl.java | 3 ++ .../SurProjectAttendanceDataMapper.xml | 28 +++++++++++++++++++ 7 files changed, 53 insertions(+), 7 deletions(-) diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java index a22e5a84..e4bdf552 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java @@ -1,5 +1,7 @@ package com.yanzhu.jh.bigscreen.web.controller; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; @@ -140,18 +142,16 @@ public class ProjectAttendanceController extends BaseController { * 今日出勤详情 */ @PostMapping("/todayAttendance") - public TableDataInfo todayAttendance(@RequestBody SurProjectAttendanceUser where){ + public TableDataInfo todayAttendance(@RequestBody SurProjectAttendanceData where){ if(where.getDeptId()==null || where.getDeptId()<=0) { if (SecurityUtils.isUserB()) { where.setPrjIds(getProjectIds()); } } - long cnt=attendanceUserService.countTodayAttendance(where); - List list=attendanceUserService.todayAttendance(where); - TableDataInfo dataInfo=new TableDataInfo(); - dataInfo.setTotal(cnt); - dataInfo.setRows(list); - return dataInfo; + startPage(); + where.setAttendanceTime(DateUtil.formatDate(DateTime.now())); + List list=attendanceDataService.todayAttendance(where); + return getDataTable(list); } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java index 3f605f9b..0aaddcc3 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java @@ -92,4 +92,6 @@ public interface SurProjectAttendanceDataMapper public List> initHuaZhuData(Map data); public String findHuaZhuCompanyType(String deptName); + + public List todayAttendance(SurProjectAttendanceData where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java index 8358dde4..555f06bb 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java @@ -93,4 +93,6 @@ public interface ISurProjectAttendanceDataService public List> initOtherData(Map data); public List> initHuaZhuData(Map data); + + List todayAttendance(SurProjectAttendanceData where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectWorkAttendanceService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectWorkAttendanceService.java index 19eb1bf5..1ffcd5d0 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectWorkAttendanceService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectWorkAttendanceService.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.service; import java.util.List; + +import com.yanzhu.jh.project.domain.SurProjectAttendanceData; import com.yanzhu.jh.project.domain.SurProjectWorkAttendance; /** @@ -68,4 +70,5 @@ public interface ISurProjectWorkAttendanceService public int deleteSurProjectWorkAttendanceById(Long id); public List selectByDate(SurProjectWorkAttendance surProjectWorkAttendance); + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index 6cf1bf0f..c03a9227 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -214,6 +214,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc sdata.setDeptId(cfg.getSubDeptId()); sdata.setProjectName(cfg.getProjectName()); sdata.setDeptName(cfg.getDeptName()); + if(sdata.getCompanyTypeId()==null){ + sdata.setCompanyTypeId("0"); + } insertSurProjectAttendanceData(sdata); }else{ sdata.setId(list.get(0).getId()); @@ -284,4 +287,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc } return list; } + + @Override + public List todayAttendance(SurProjectAttendanceData where) { + return surProjectAttendanceDataMapper.todayAttendance(where); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkAttendanceServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkAttendanceServiceImpl.java index 17c63117..c08b62f7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkAttendanceServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkAttendanceServiceImpl.java @@ -6,6 +6,7 @@ import java.util.List; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; +import com.yanzhu.jh.project.domain.SurProjectAttendanceData; import com.yanzhu.jh.project.domain.SurProjectDeptWroks; import com.yanzhu.jh.project.mapper.SurProjectDeptWroksMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -148,4 +149,6 @@ public class SurProjectWorkAttendanceServiceImpl implements ISurProjectWorkAtten public List selectByDate(SurProjectWorkAttendance surProjectWorkAttendance) { return surProjectWorkAttendanceMapper.selectByDate(surProjectWorkAttendance); } + + } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index e61eeb33..5aa915fd 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -354,4 +354,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sd.dept_name = #{deptName} + + \ No newline at end of file From 4627b967c0105ef7bbc29f0d1b06bf67c5eac3c0 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 23 Mar 2024 02:28:39 +0800 Subject: [PATCH 4/4] update code --- .../ProjectAttendanceController.java | 3 ++- .../SurProjectAttendanceDataMapper.java | 2 ++ .../ISurProjectAttendanceDataService.java | 2 ++ .../SurProjectAttendanceDataServiceImpl.java | 5 +++++ .../SurProjectAttendanceDataMapper.xml | 20 +++++++++++++++++++ 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java index e4bdf552..815ebf96 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java @@ -122,7 +122,8 @@ public class ProjectAttendanceController extends BaseController { where.setPrjIds(getProjectIds()); } } - List list=attendanceDataService.groupByComany(where); + where.setAttendanceTime(DateUtil.formatDate(DateTime.now())); + List list=attendanceDataService.groupTodayCompanyTypeId(where); return AjaxResult.success(list); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java index 0aaddcc3..c156d515 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java @@ -94,4 +94,6 @@ public interface SurProjectAttendanceDataMapper public String findHuaZhuCompanyType(String deptName); public List todayAttendance(SurProjectAttendanceData where); + + public List groupTodayCompanyTypeId(SurProjectAttendanceData where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java index 555f06bb..42bbc92f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java @@ -95,4 +95,6 @@ public interface ISurProjectAttendanceDataService public List> initHuaZhuData(Map data); List todayAttendance(SurProjectAttendanceData where); + + List groupTodayCompanyTypeId(SurProjectAttendanceData where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index c03a9227..070d964d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -292,4 +292,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc public List todayAttendance(SurProjectAttendanceData where) { return surProjectAttendanceDataMapper.todayAttendance(where); } + + @Override + public List groupTodayCompanyTypeId(SurProjectAttendanceData where) { + return surProjectAttendanceDataMapper.groupTodayCompanyTypeId(where); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index 5aa915fd..97bfb44c 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -382,4 +382,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file