|
@@ -744,9 +744,11 @@
|
|
|
date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,date_format(a.audit_time ,'%Y-%m-%d %H:%i:%S') auditTimes,
|
|
date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,date_format(a.audit_time ,'%Y-%m-%d %H:%i:%S') auditTimes,
|
|
|
d.name sname, date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
|
|
d.name sname, date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
|
|
|
a.plan ,a.next_plan nextPlan ,a.expected_effect expectedEffect,a.update_status updateStatus,a.assist_aid_name assistAidName,
|
|
a.plan ,a.next_plan nextPlan ,a.expected_effect expectedEffect,a.update_status updateStatus,a.assist_aid_name assistAidName,
|
|
|
- a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName
|
|
|
|
|
|
|
+ a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName,e.contract_no contractNo,
|
|
|
|
|
+ e.total_amount totalAmout,tom.service_type serviceType ,tom.service_project serviceProject
|
|
|
from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
|
|
from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
|
|
|
- left join admin d on b.aid=d.id where 1=1
|
|
|
|
|
|
|
+ left join admin d on b.aid=d.id left join t_order_new e on a.order_no =e.order_no left join t_order_mid tom on a.order_no =tom.order_no
|
|
|
|
|
+ where 1=1
|
|
|
<if test="publicType != null">
|
|
<if test="publicType != null">
|
|
|
and a.type= #{publicType}
|
|
and a.type= #{publicType}
|
|
|
</if>
|
|
</if>
|