update code

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;

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 = "所属班组")

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<SurProjectAttendanceCfg> selectSurProjectAttendanceCfgListForAllInfo(SurProjectAttendanceCfg where);
 }

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<SurProjectAttendanceData> list=selectSurProjectAttendanceDataListEx(where);
         if(list.size()==0){
+            //设置考勤其它参数
+            //查询人员信息
+            SurProjectAttendanceUser userWhere=new SurProjectAttendanceUser();
+            userWhere.setWorkerId(sdata.getWorkerId());
+            List<SurProjectAttendanceUser> 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<SurProjectAttendanceGroup> 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<SurProjectAttendanceCfg> 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);

yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceCfgMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="projectName" column="projectName"/>
+        <result property="deptName" column="dept_name"/>
         <result property="unitName" column="unitName"/>
         <result property="vendorName" column="vendorName"/>
     </resultMap>
@@ -46,6 +47,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+
+    <select id="selectSurProjectAttendanceCfgListForAllInfo" parameterType="SurProjectAttendanceCfg" resultMap="SurProjectAttendanceCfgResult">
+        SELECT a.*,b.projectName,c.dept_name
+        FROM sur_project_attendance_cfg a,sur_project b,sys_dept c WHERE c.dept_id=a.sub_dept_id AND a.project_id=b.id
+        <where>
+            <if test="id != null "> and id = #{id}</if>
+        </where>
+    </select>
+    
     <select id="selectSurProjectAttendanceCfgById" parameterType="Long" resultMap="SurProjectAttendanceCfgResult">
         <include refid="selectSurProjectAttendanceCfgVo"/>
         where id = #{id}

yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml

@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serverid != null "> and serverid = #{serverid}</if>
             <if test="workerId != null "> and workerId = #{workerId}</if>
             <if test="attendanceType != null  and attendanceType != ''"> and attendance_type = #{attendanceType}</if>
-            <if test="attendanceTime != null  and attendanceTime != ''"> and attendance_time = #{attendanceTime}</if>
+            <if test="attendanceTime != null  and attendanceTime != ''"> and date(attendance_time) = date(#{attendanceTime})</if>
             <if test="identification != null  and identification != ''"> and identification = #{identification}</if>
             <if test="teamId != null "> and teamId = #{teamId}</if>
             <if test="workTypeCode != null  and workTypeCode != ''"> and workTypeCode = #{workTypeCode}</if>