|
|
@@ -496,6 +496,18 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
|
|
|
<if test="clockTime !=null">
|
|
|
and a.release_start < #{clockTime} and a.release_end > #{clockTime}
|
|
|
</if>
|
|
|
+ <if test="releaseStarts != null and publicEnd != null">
|
|
|
+ and a.release_start BETWEEN #{releaseStarts} and #{publicEnd}
|
|
|
+ </if>
|
|
|
+ <if test="clockTime !=null">
|
|
|
+ and b.nickname like CONCAT('%',#{userName},'%')
|
|
|
+ </if>
|
|
|
+ <if test="clockTime !=null">
|
|
|
+ and a.status = #{status}
|
|
|
+ </if>
|
|
|
+ <if test="clockTime !=null">
|
|
|
+ and a.clock_in = #{clockIn}
|
|
|
+ </if>
|
|
|
ORDER BY (case when a.status=1 then 1 else 2 end),a.status ,a.create_time
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
|
@@ -514,6 +526,18 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
|
|
|
<if test="clockTime !=null">
|
|
|
and a.release_start < #{clockTime} and a.release_end > #{clockTime}
|
|
|
</if>
|
|
|
+ <if test="releaseStarts != null and publicEnd != null">
|
|
|
+ and a.release_start BETWEEN #{releaseStarts} and #{publicEnd}
|
|
|
+ </if>
|
|
|
+ <if test="clockTime !=null">
|
|
|
+ and b.nickname like CONCAT('%',#{userName},'%')
|
|
|
+ </if>
|
|
|
+ <if test="clockTime !=null">
|
|
|
+ and a.status = #{status}
|
|
|
+ </if>
|
|
|
+ <if test="clockTime !=null">
|
|
|
+ and a.clock_in = #{clockIn}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="selectDtails" resultType="com.goafanti.admin.bo.OutPublicRelease">
|