diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue index 710c7b0b..734ce248 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-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..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 @@ -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; @@ -120,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); } @@ -140,18 +143,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 d2a4fe24..8c0f2bcb 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 @@ -100,4 +100,8 @@ public interface SurProjectAttendanceDataMapper public List> initHuaZhuData(Map data); 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 4d93031d..0b4ba123 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 @@ -101,4 +101,8 @@ public interface ISurProjectAttendanceDataService public List> initOtherData(Map data); 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/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 9fa12020..453614ca 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 @@ -173,9 +173,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){ //设置考勤其它参数 @@ -213,6 +212,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()));//获取华筑的分包商类型 } //查询项目部门信息 @@ -227,6 +227,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()); @@ -301,4 +304,14 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc } return dataList; } + + @Override + 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/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 099f320b..f1fa72cd 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -63,6 +63,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} @@ -83,6 +85,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} @@ -362,4 +366,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sd.dept_name = #{deptName} + + + + \ No newline at end of file