|
|
@@ -1718,7 +1718,10 @@ progress_tid = values(progress_tid)
|
|
|
ttm.party_amount partyAmount,a.commodity_price commodityPrice,a.outsource,date_format(a.task_end_time,'%Y-%m-%d') taskEndTime,date_format(e.sign_time,'%Y-%m-%d') signTime,
|
|
|
date_format(e.create_time ,'%Y-%m-%d')creteTime,a.patent_type patentType,tmer.service_year serviceYear,toa.type,toa.type_explain typeExplain,
|
|
|
a.ht_member as htMember,a.additional_deduction additionalDeduction,a.rd_awardsubsidy rdAwardsubsidy,b.project_type as memberProjectType
|
|
|
- from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
|
|
|
+ from t_order_task a
|
|
|
+ <if test="cid != null or memberProjectType !=null" >
|
|
|
+ left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
|
|
|
+ </if>
|
|
|
left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id left join t_order_mid tm on a.order_no =tm.order_no
|
|
|
left join department h on e.order_dep=h.id left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
|
|
|
on a.id=l.tid left join t_task_mid ttm on a.id=ttm.tid left join t_task_member tmer on a.id=tmer.tid
|
|
|
@@ -1810,7 +1813,7 @@ progress_tid = values(progress_tid)
|
|
|
<select id="selectOrderTaskListCount" resultType="java.lang.Integer">
|
|
|
select count(*) from t_order_task a
|
|
|
left join t_order_new e on a.order_no=e.order_no
|
|
|
- <if test="cid != null">
|
|
|
+ <if test="cid != null or memberProjectType !=null" >
|
|
|
left join business_project b on a.commodity_id=b.id
|
|
|
left join business_category c on b.cid=c.id
|
|
|
</if>
|