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

update code

dev
lijun 2024-10-29 23:20:16 +08:00
parent 9c1d0b36cf
commit 5546c225ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AttendanceJgwTask.java
View File

@ -1095,7 +1095,6 @@ public class AttendanceJgwTask {
String dtEnd=DateUtil.format(DateTime.now(),"yyyy-MM-dd");
String dtStart=DateUtil.format(DateUtil.offsetDay(DateTime.now(),-30),"yyyy-MM-dd");
syncAttendanceData(dtStart,dtEnd);
syncAttendanceData(dtStart,dtEnd);
}

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

@ -148,7 +148,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="attendanceOutTime!=null and attendanceOutTime!=''">
and date(attendance_out_time) &lt;=date(#{attendanceOutTime})
and (date(attendance_out_time) &lt;=date(#{attendanceOutTime}) or date(attendance_time) &lt;=date(#{attendanceOutTime}))
</if>
<if test="teamId != null "> and teamId = #{teamId}</if>
@ -175,7 +175,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scanPhoto != null and scanPhoto != ''"> and scanPhoto like concat('%', #{scanPhoto}, '%')</if>
<if test="workerName != null and workerName != ''"> and workerName like concat('%', #{workerName}, '%')</if>
<if test="isDel != null "> and is_del = #{isDel}</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(attendance_time) &gt;= date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and
(date(attendance_time) &gt;= date(#{attendanceTime}) or date(attendance_out_time) &gt;= date(#{attendanceTime}) )</if>
<if test="identification != null and identification != ''"> and identification = #{identification}</if>
</where>
order by id desc