sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sxyanzhu:04004b10ee1076e1de6b4eebdf48671bcb19b79f
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
..
compare: sxyanzhu:d67247be370451975acfaef77a0ba3729bff1a6d
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

No commits in common. "04004b10ee1076e1de6b4eebdf48671bcb19b79f" and "d67247be370451975acfaef77a0ba3729bff1a6d" have entirely different histories.
04004b10ee ... d67247be37

2 changed files with 10 additions and 7 deletions
Show Stats Expand all files Collapse all files

13
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
View File

@ -1,6 +1,9 @@
package com.yanzhu.jh.project.service.impl; package com.yanzhu.jh.project.service.impl;
import java.util.*; import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
@ -271,8 +274,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
for (Map<String,Object> map:list) { for (Map<String,Object> map:list) {
for(SurProjectAttendanceUser sau:datas){ for(SurProjectAttendanceUser sau:datas){
if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){ if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
map.put("inTime",sau.getInTime()); map.put("inTime",map.get("inTime"));
map.put("outTime",sau.getOutTime()); map.put("outTime",map.get("outTime"));
dataList.add(map); dataList.add(map);
} }
} }
@ -292,8 +295,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
for (Map<String,Object> map:list) { for (Map<String,Object> map:list) {
for(SurProjectAttendanceUser sau:datas){ for(SurProjectAttendanceUser sau:datas){
if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){ if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
map.put("inTime",sau.getInTime()); map.put("inTime",map.get("inTime"));
map.put("outTime",sau.getOutTime()); map.put("outTime",map.get("outTime"));
dataList.add(map); dataList.add(map);
} }
} }

4
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
View File

@ -447,13 +447,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="todayAttendanceOtherData" parameterType="map" resultMap="SurProjectAttendanceUserResult"> <select id="todayAttendanceOtherData" parameterType="map" resultMap="SurProjectAttendanceUserResult">
select workerid,min(attendance_time) inTime,max(attendance_time) outTime from sur_project_attendance_data where cfgid=#{cfgid} and DATE(attendance_time)=#{date} select workerid,attendance_type name,min(attendance_time) inTime,max(attendance_time) outTime from sur_project_attendance_data where cfgid=#{cfgid} and DATE(attendance_time)=#{date}
<if test="list !=null and list.size()>0"> <if test="list !=null and list.size()>0">
and workerid in and workerid in
<foreach collection="list" item="item" index="index" open="(" close=")" separator=","> <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
group by workerid group by workerid,attendance_type
</select> </select>
</mapper> </mapper>