|
@@ -2141,13 +2141,14 @@ progress_tid = values(progress_tid)
|
|
|
f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper,a.member_type memberType,
|
|
f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper,a.member_type memberType,
|
|
|
date_format(a.split_time,'%Y-%m-%d %H:%i:%S') splitTimes,ad.name splitAname,a.split_id splitId,a.patent_type patentType,a.picture_url pictureUrl,
|
|
date_format(a.split_time,'%Y-%m-%d %H:%i:%S') splitTimes,ad.name splitAname,a.split_id splitId,a.patent_type patentType,a.picture_url pictureUrl,
|
|
|
ttm.service_life serviceLife,ttm.service_year serviceYear ,ttm.year_sum yearSum ,ttm.contract_term contractTerm,a.process_status processStatus,
|
|
ttm.service_life serviceLife,ttm.service_year serviceYear ,ttm.year_sum yearSum ,ttm.contract_term contractTerm,a.process_status processStatus,
|
|
|
- a.score_status scoreStatus,a.score_number scoreNumber
|
|
|
|
|
|
|
+ a.score_status scoreStatus,a.score_number scoreNumber,td.project_name projectMemberName
|
|
|
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 left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
|
|
|
left join admin d on a.task_receiver=d.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 admin d on a.task_receiver=d.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 department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber
|
|
left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber
|
|
|
from task_progress group by task_id) i on a.id=i.task_id left join (select order_no,max(name)as name
|
|
from task_progress group by task_id) i on a.id=i.task_id left join (select order_no,max(name)as name
|
|
|
from outsource_organization group by order_no) j on a.order_no=j.order_no left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid
|
|
from outsource_organization group by order_no) j on a.order_no=j.order_no 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 admin ad on ad.id=a.split_aid left join t_task_member ttm on a.id=ttm.tid
|
|
left join t_order_outsource l on a.id=l.tid left join admin ad on ad.id=a.split_aid left join t_task_member ttm on a.id=ttm.tid
|
|
|
|
|
+ left join task_details td on a.progress_tid=td.id
|
|
|
where e.order_status in (0,1,2,3,4,5)
|
|
where e.order_status in (0,1,2,3,4,5)
|
|
|
and split_status =2 and a.split_super= #{tid}
|
|
and split_status =2 and a.split_super= #{tid}
|
|
|
<if test="type == 1">
|
|
<if test="type == 1">
|