|
@@ -676,7 +676,7 @@
|
|
|
|
|
|
|
|
<select id="listPublicRelease" resultType="com.goafanti.weChat.bo.OutPublicReleaseList">
|
|
<select id="listPublicRelease" resultType="com.goafanti.weChat.bo.OutPublicReleaseList">
|
|
|
select a.id ,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.aid,a.public_type publicType,a.order_no orderNo,
|
|
select a.id ,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.aid,a.public_type publicType,a.order_no orderNo,
|
|
|
- ton.contract_no contractNo,
|
|
|
|
|
|
|
+ ton.contract_no contractNo,a.process_status processStatus,
|
|
|
date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
|
|
date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
|
|
|
date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
|
|
date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
|
|
|
a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
|
|
a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
|
|
@@ -743,7 +743,8 @@
|
|
|
and a.assist in(0,1)
|
|
and a.assist in(0,1)
|
|
|
and a.tech_start_process in (0,2)
|
|
and a.tech_start_process in (0,2)
|
|
|
and a.assist_process in (0,1,2,3,4)
|
|
and a.assist_process in (0,1,2,3,4)
|
|
|
- and apr.reviewer_id = #{aid} and apr.type=0
|
|
|
|
|
|
|
+ and apr.reviewer_id = #{aid}
|
|
|
|
|
+ and ((apr.type=0 and a.process_status in (0,1)) or(apr.type=0 and a.process_status in (2)))
|
|
|
<if test="status == 1">
|
|
<if test="status == 1">
|
|
|
and a.status = #{status} and a.assist_process in (0,1)
|
|
and a.status = #{status} and a.assist_process in (0,1)
|
|
|
</if>
|
|
</if>
|