From e5d1c148424b2d882483a4e71aa43d1a7ca06665 Mon Sep 17 00:00:00 2001 From: haha Date: Fri, 22 Mar 2024 23:44:12 +0800 Subject: [PATCH] update code --- .../domain/SurProjectAttendanceCfg.java | 9 +++ .../domain/SurProjectAttendanceData.java | 6 +- .../mapper/SurProjectAttendanceCfgMapper.java | 2 + .../SurProjectAttendanceDataServiceImpl.java | 73 ++++++++++++++++++- .../project/SurProjectAttendanceCfgMapper.xml | 10 +++ .../SurProjectAttendanceDataMapper.xml | 2 +- 6 files changed, 96 insertions(+), 6 deletions(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceCfg.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceCfg.java index d5473c9c..f7b1d14d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceCfg.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceCfg.java @@ -42,6 +42,15 @@ public class SurProjectAttendanceCfg extends BaseEntity @Excel(name = "状态") private Long state; + private String deptName; + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } private String projectName; private String unitName; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java index ef817b43..5cda8fcc 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java @@ -64,11 +64,11 @@ public class SurProjectAttendanceData extends BaseEntity this.workerPhoto = workerPhoto; } - public Integer getWorkerGender() { + public Long getWorkerGender() { return workerGender; } - public void setWorkerGender(Integer workerGender) { + public void setWorkerGender(Long workerGender) { this.workerGender = workerGender; } @@ -157,7 +157,7 @@ public class SurProjectAttendanceData extends BaseEntity @Excel(name = "照片") private String workerPhoto; @Excel(name = "性别0:男 1:女") - private Integer workerGender; + private Long workerGender; @Excel(name = "出生日期时间戳") private Long birthDate; @Excel(name = "所属班组") diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceCfgMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceCfgMapper.java index 0cb2691a..a5d827d0 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceCfgMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceCfgMapper.java @@ -58,4 +58,6 @@ public interface SurProjectAttendanceCfgMapper * @return 结果 */ public int deleteSurProjectAttendanceCfgByIds(Long[] ids); + + public List selectSurProjectAttendanceCfgListForAllInfo(SurProjectAttendanceCfg 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 0c3153e4..8682959a 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 @@ -1,8 +1,16 @@ package com.yanzhu.jh.project.service.impl; import java.util.List; + +import cn.hutool.core.date.DateTime; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; +import com.yanzhu.jh.project.domain.SurProjectAttendanceCfg; +import com.yanzhu.jh.project.domain.SurProjectAttendanceGroup; +import com.yanzhu.jh.project.domain.SurProjectAttendanceUser; +import com.yanzhu.jh.project.mapper.SurProjectAttendanceCfgMapper; +import com.yanzhu.jh.project.mapper.SurProjectAttendanceGroupMapper; +import com.yanzhu.jh.project.mapper.SurProjectAttendanceUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.project.mapper.SurProjectAttendanceDataMapper; @@ -21,6 +29,16 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc @Autowired private SurProjectAttendanceDataMapper surProjectAttendanceDataMapper; + @Autowired + private SurProjectAttendanceUserMapper surProjectAttendanceUserMapper; + + @Autowired + private SurProjectAttendanceGroupMapper surProjectAttendanceGroupMapper; + + @Autowired + private SurProjectAttendanceCfgMapper surProjectAttendanceCfgMapper; + + /** * 查询劳务实名制管理 * @@ -136,16 +154,67 @@ 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())); List list=selectSurProjectAttendanceDataListEx(where); if(list.size()==0){ + //设置考勤其它参数 + //查询人员信息 + SurProjectAttendanceUser userWhere=new SurProjectAttendanceUser(); + userWhere.setWorkerId(sdata.getWorkerId()); + List uList= surProjectAttendanceUserMapper.selectSurProjectAttendanceUserList(userWhere); + if(uList.size()==0){ + return; + } + SurProjectAttendanceUser user=uList.get(0); + sdata.setWorkerName(user.getName()); + sdata.setWorkerPhoto(user.getPhoto()); + sdata.setWorkerGender(user.getGender());; + sdata.setGroupName(user.getGroupName()); + sdata.setWorkTypeName(user.getWorkTypeName()); + sdata.setEthnic(user.getEthnic()); + sdata.setNativePlace(user.getNativePlace()); + sdata.setPhone(user.getPhone()); + sdata.setSpecWorkType(user.getSpecWorkType()); + //查询分组信息 + SurProjectAttendanceGroup groupWhere=new SurProjectAttendanceGroup(); + groupWhere.setCfgid(sdata.getCfgid()); + groupWhere.setCompanyId(sdata.getCompanyId()); + List gList=surProjectAttendanceGroupMapper.selectSurProjectAttendanceGroupList(groupWhere); + if(gList.size()==0){ + return; + } + SurProjectAttendanceGroup group=gList.get(0); + sdata.setCompanyName(group.getCompanyName()); + sdata.setCompanyTypeId(group.getCompanyTypeId()); + //查询华筑的分组信息 + if("huazhu".equals(sdata.getVendorsCode())){ + sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型 + } + //查询项目部门信息 + SurProjectAttendanceCfg cfgWhere=new SurProjectAttendanceCfg(); + cfgWhere.setId(sdata.getCfgid()); + List cfgList=surProjectAttendanceCfgMapper.selectSurProjectAttendanceCfgListForAllInfo(cfgWhere); + if(cfgList.size()==0){ + return; + } + SurProjectAttendanceCfg cfg=cfgList.get(0); + sdata.setProjectId(cfg.getProjectId()); + sdata.setDeptId(cfg.getSubDeptId()); + sdata.setProjectName(cfg.getProjectName()); + sdata.setDeptName(cfg.getDeptName()); insertSurProjectAttendanceData(sdata); }else{ - sdata.setId(list.get(0).getId()); + SurProjectAttendanceData upData=list.get(0); + upData.setAttendanceOutTime(sdata.getAttendanceTime()); updateSurProjectAttendanceData(sdata); } } + private String getHuazhuCompanyTypeId(String groupName) { + return ""; + } + @Override public String getLastServerId(SurProjectAttendanceData where) { return ""+surProjectAttendanceDataMapper.getLastServerId(where); diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceCfgMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceCfgMapper.xml index af682080..ef8314a2 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceCfgMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceCfgMapper.xml @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -45,6 +46,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and is_del = #{isDel} + + +