|
|
@@ -1719,9 +1719,7 @@ progress_tid = values(progress_tid)
|
|
|
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
|
|
|
- <if test="cid != 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 business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
|
|
|
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
|
|
|
@@ -1806,7 +1804,15 @@ progress_tid = values(progress_tid)
|
|
|
and e.sign_time between #{startTime} and #{endTime}
|
|
|
</if>
|
|
|
<if test="memberProjectType !=null">
|
|
|
- and a.project_type= #{memberProjectType,jdbcType=INTEGER}
|
|
|
+ <if test="memberProjectType == 1">
|
|
|
+ and a.ht_member= 1
|
|
|
+ </if>
|
|
|
+ <if test="memberProjectType == 2">
|
|
|
+ and a.additional_deduction=1
|
|
|
+ </if>
|
|
|
+ <if test="memberProjectType == 3">
|
|
|
+ and a.rd_awardsubsidy=1
|
|
|
+ </if>
|
|
|
</if>
|
|
|
</sql>
|
|
|
|