|
|
@@ -1025,14 +1025,15 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectOrderTaskAll" resultType="com.goafanti.order.bo.TOrderTaskBo">
|
|
|
- select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
|
|
|
- a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
|
|
|
- c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,a.split_super splitSuper,
|
|
|
- a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
|
|
|
- a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus, a.task_receiver as taskReceiver ,a.split_status splitStatus
|
|
|
- from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
|
|
|
- left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
|
|
|
- left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
|
|
|
+ select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
|
|
|
+ a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
|
|
|
+ c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,
|
|
|
+ a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
|
|
|
+ a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus, a.task_receiver as taskReceiver ,
|
|
|
+ a.split_status splitStatus,a.split_super splitSuper,a.split_aid splitAid,a.split_time splitTime
|
|
|
+ from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
|
|
|
+ left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
|
|
|
+ left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
|
|
|
where a.super_id is null and a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
|
|
|
</select>
|
|
|
|
|
|
@@ -1381,7 +1382,7 @@ select
|
|
|
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 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 where e.delete_sign !=1 and e.order_status not in (5,7)
|
|
|
+ on a.id=l.tid left join admin ad on ad.id=a.split_aid where e.order_status not in (5,7)
|
|
|
and split_status =2 and a.split_super= #{tid} order by split_id
|
|
|
</select>
|
|
|
<select id="selectByidGetCname" resultType="java.lang.String">
|