Просмотр исходного кода

变更修改

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
ef58f821a1

+ 4 - 12
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -729,7 +729,8 @@ select
   left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id 
   left join department e on b.order_dep=e.id
 	<if test="processState==2 or processState==3 "> 
-	left join (select order_no,consultant_id,manager_id from t_order_task group by order_no,consultant_id,manager_id) x on a.order_no=x.order_no
+	left join (select order_no, consultant_id, manager_id from t_order_task a where consultant_id is not null and manager_id is not null 
+	group by order_no, consultant_id, manager_id) x on a.order_no = x.order_no
 	</if> 
 	where 1=1
 	<if test="processState==0">
@@ -827,17 +828,8 @@ select
   left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id 
   left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id
 	<if test="processState==2 or processState==3 "> 
-	left join (
-	select
-		order_no,
-		consultant_id,
-		manager_id
-	from
-		t_order_task
-	group by
-		order_no,
-		consultant_id,
-		manager_id) x on a.order_no=x.order_no
+	left join (select order_no, consultant_id, manager_id from t_order_task a where consultant_id is not null and manager_id is not null 
+	group by order_no, consultant_id, manager_id) x on a.order_no = x.order_no
 	</if>
 	where 1=1
 	<if test="processState==0">

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1382,7 +1382,7 @@ select
     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)  
-    and a.outsource= 0 and split_status =2 and a.split_super= #{tid} order by split_id
+    and split_status =2 and a.split_super= #{tid} order by split_id
   </select>
     <select id="selectByidGetCname" resultType="java.lang.String">
    select b.cname from business_project a left join business_category b on a.cid =b.id

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -420,7 +420,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
 		List<TOrderDun> td1=tOrderDunMapper.selectByOrderNo(nb.getOrderNo());
 		List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(), null, null);
-		List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTask(nb.getOrderNo());
+		List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo());
 		List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
 		String newOrderNo=idGenerator.generateId().toString();
 		t1.setOrderNo(newOrderNo);