|
|
@@ -704,6 +704,9 @@
|
|
|
<if test="clockIn !=null">
|
|
|
and a.clock_in= #{clockIn}
|
|
|
</if>
|
|
|
+ <if test="contractNo !=null">
|
|
|
+ and f.contract_no= #{contractNo}
|
|
|
+ </if>
|
|
|
order by b.status,b.create_time desc
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
|
@@ -714,6 +717,9 @@
|
|
|
select count(*)
|
|
|
from public_release_details a left join public_release b on a.prid =b.id
|
|
|
left join admin c on b.aid =c.id left join `user` d on a.uid =d.id
|
|
|
+ <if test="contractNo !=null">
|
|
|
+ left join t_order_new f on b.order_no =f.order_no
|
|
|
+ </if>
|
|
|
where 1=1
|
|
|
<if test="publicType != null">
|
|
|
and b.type= #{publicType}
|
|
|
@@ -745,6 +751,9 @@
|
|
|
<if test="clockIn !=null">
|
|
|
and a.clock_in= #{clockIn}
|
|
|
</if>
|
|
|
+ <if test="contractNo !=null">
|
|
|
+ and f.contract_no= #{contractNo}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="checkTime" resultType="java.lang.Integer">
|