|
|
@@ -600,7 +600,7 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
|
|
|
|
|
|
<select id="listPublicDtails" resultType="com.goafanti.weChat.bo.OutPublicDtails">
|
|
|
select b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
|
|
|
- date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,
|
|
|
+ date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn,
|
|
|
date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds
|
|
|
from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
|
|
|
where 1=1
|
|
|
@@ -616,6 +616,9 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
|
|
|
<if test="status != null">
|
|
|
and a.status = #{status}
|
|
|
</if>
|
|
|
+ <if test="clockIn !=null">
|
|
|
+ and a.clock_in= #{clockIn}
|
|
|
+ </if>
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
|
</if>
|
|
|
@@ -637,6 +640,9 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
|
|
|
<if test="status != null">
|
|
|
and a.status = #{status}
|
|
|
</if>
|
|
|
+ <if test="clockIn !=null">
|
|
|
+ and a.clock_in= #{clockIn}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="checkTime" resultType="java.lang.Integer">
|