|
|
@@ -1121,19 +1121,19 @@
|
|
|
<if test="startTime != null and endTime != null">
|
|
|
and clock_in_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
- )d on a.id=d.uid
|
|
|
+ )e on a.id=e.uid
|
|
|
</if>
|
|
|
where a.type=1
|
|
|
<if test="type != 5 and type !=6">
|
|
|
and a.aid= #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="type == 5 or type ==6">
|
|
|
- and d.aid= #{aid,jdbcType=VARCHAR}
|
|
|
+ and e.aid= #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="type == 0 or type == 1">
|
|
|
and a.share_type = 0
|
|
|
</if>
|
|
|
- <if test="type !=1 and type!=4 and type!=6">
|
|
|
+ <if test="type ==0 or type==3 or type==5 or type==7">
|
|
|
and a.channel=0
|
|
|
</if>
|
|
|
<if test="type == 1 or type==4 or type==6">
|
|
|
@@ -1169,20 +1169,20 @@
|
|
|
<if test="startTime != null and endTime != null">
|
|
|
and clock_in_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
- )d on a.id=d.uid
|
|
|
+ )e on a.id=d.uid
|
|
|
</if>
|
|
|
where a.type=1
|
|
|
<if test="type != 5 and type !=6">
|
|
|
and a.aid= #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="type == 5 or type ==6">
|
|
|
- and d.aid= #{aid,jdbcType=VARCHAR}
|
|
|
+ and e.aid= #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="type == 0 or type == 1">
|
|
|
and a.share_type = 0
|
|
|
</if>
|
|
|
- <if test="type !=1 and type!=4 and type!=6">
|
|
|
- and a.channel=0
|
|
|
+ <if test="type ==0 or type==3 or type==5 or type==7">
|
|
|
+ and a.channel=0
|
|
|
</if>
|
|
|
<if test="type == 1 or type==4 or type==6">
|
|
|
and a.channel=1
|