|
|
@@ -947,17 +947,21 @@
|
|
|
b.main_name mainName,b.assist,b.assistant_aid assistantAid, b.assistant_name assistantName,f.contract_no contractNo,
|
|
|
uai.customer_demand customerDemand,uai.early_communication earlyCommunication,uai.interview_ideas interviewIdeas,
|
|
|
uai.interview_purpose interviewPurpose,uai.interview_feedback interviewFeedback,uai.follow_up_plan followUpPlan,
|
|
|
- uai.interview_recommend interviewRecommend,
|
|
|
+ uai.interview_recommend interviewRecommend,pad.type assistType,pad.content_type assistContentType,pad.content assistContent,
|
|
|
e.name sname,f.total_amount totalAmout,d.sign_bills signBills,date_format(d.sign_time,'%Y-%m-%d')signTime
|
|
|
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 t_order_new f on b.order_no =f.order_no
|
|
|
left join `user` d on a.uid =d.id left join admin e on d.aid=e.id
|
|
|
left join user_archives_interview uai on a.id=uai.prdid
|
|
|
+ left join public_assist_details pad on b.id=pad.prid
|
|
|
where 1=1
|
|
|
<if test="publicType != null">
|
|
|
and b.type= #{publicType}
|
|
|
</if>
|
|
|
+ <if test="assistType!=null">
|
|
|
+ and pad.type= #{assistType}
|
|
|
+ </if>
|
|
|
<if test="aid != null">
|
|
|
and b.aid= #{aid}
|
|
|
</if>
|
|
|
@@ -1004,10 +1008,16 @@
|
|
|
<if test="contractNo !=null">
|
|
|
left join t_order_new f on b.order_no =f.order_no
|
|
|
</if>
|
|
|
+ <if test="assistType!=null">
|
|
|
+ left join public_assist_details pad on b.id=pad.prid
|
|
|
+ </if>
|
|
|
where 1=1
|
|
|
<if test="publicType != null">
|
|
|
and b.type= #{publicType}
|
|
|
</if>
|
|
|
+ <if test="assistType!=null">
|
|
|
+ and pad.type= #{assistType}
|
|
|
+ </if>
|
|
|
<if test="aid != null">
|
|
|
and b.aid= #{aid}
|
|
|
</if>
|