|
|
@@ -678,7 +678,7 @@
|
|
|
|
|
|
|
|
|
<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.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,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.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
|
|
|
@@ -688,7 +688,7 @@
|
|
|
opc.max_process maxProcess,
|
|
|
</if>
|
|
|
ea.total_amount expenseAmount ,a.clock_in clockIn,a.assist_process assistProcess,a.tech_start_process techStartProcess
|
|
|
- from public_release a left join admin c on a.aid =c.id
|
|
|
+ from public_release a
|
|
|
left join expense_account ea ON a.id = ea.prid AND ea.status IN (0, 1, 2, 3)
|
|
|
<if test="type==2">
|
|
|
left join department d on c.department_id =d.id
|
|
|
@@ -753,7 +753,8 @@
|
|
|
</if>
|
|
|
<if test="status == 2">
|
|
|
and a.status in(1,2) and a.assist_process in (0,2,3,4)
|
|
|
- and ((apr.type=0 and a.process_status in (0,4)) or(apr.type=4 and a.process_status in (0,4)))
|
|
|
+ and apr.type in (0,4)
|
|
|
+ and a.process_status in (0,4)
|
|
|
and apr.reviewer_id = #{aid}
|
|
|
</if>
|
|
|
</if>
|