Compare commits
No commits in common. "5c51c1400d639acea219338bbcce711066415045" and "7144937b6aa1db06d851fb5a3809aab73ae05743" have entirely different histories.
5c51c1400d
...
7144937b6a
|
@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test='activeTags == "jxz"'> and (ppc.approve_status != '100' or ppc.check_result is null or ppc.check_result != '1')</if>
|
<if test='activeTags == "jxz"'> and (ppc.approve_status != '100' or ppc.check_result is null or ppc.check_result != '1')</if>
|
||||||
<if test='activeTags == "jwc"'> and ppc.approve_status = '100' and ppc.check_result = '1'</if>
|
<if test='activeTags == "jwc"'> and ppc.approve_status = '100' and ppc.check_result = '1'</if>
|
||||||
</if>
|
</if>
|
||||||
<if test="remark!=null and remark=='lastWeek'">
|
<if test="remark!=null and remark='lastWeek'">
|
||||||
and ppc.checking_date BETWEEN
|
and ppc.checking_date BETWEEN
|
||||||
DATE_FORMAT(CURDATE() - INTERVAL (WEEKDAY(CURDATE()) ) DAY, '%Y-%m-%d 00:00:00')
|
DATE_FORMAT(CURDATE() - INTERVAL (WEEKDAY(CURDATE()) ) DAY, '%Y-%m-%d 00:00:00')
|
||||||
AND
|
AND
|
||||||
|
|
Loading…
Reference in New Issue