Преглед изворни кода

会员子项目未通过显示BUG修复

anderx пре 3 година
родитељ
комит
b085f76e19

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

@@ -1215,7 +1215,11 @@
         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
     where  e.order_status  in (0,1,2,3,4)
-    and split_status =2 and a.split_super= #{tid} order by split_id
+    and split_status =2 and a.split_super= #{tid}
+    <if test="type == 1">
+      and a.process_status in(0,3)
+    </if>
+    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/OrderProjectService.java

@@ -54,7 +54,7 @@ public interface OrderProjectService {
 
 	int pushSplitProject(Integer tid, String splitList);
 
-	List<TOrderTaskListBo> splitProjectList(Integer tid);
+	List<TOrderTaskListBo> splitProjectList(Integer tid,Integer type);
 
 	void addNoticAndEmail(OutPaymentNode pn, Integer code);
 

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

@@ -368,7 +368,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 				//如果有拆分获取拆分数据
 				if (t.getSplitStatus()==1){
-					List<TOrderTaskListBo> l=orderProjectService.splitProjectList(t.getId());
+					List<TOrderTaskListBo> l=orderProjectService.splitProjectList(t.getId(),type);
 					t.setSplitList(l);
 				}
 		}