anderx лет назад: 3
Родитель
Сommit
b73001e8f8

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

@@ -1743,6 +1743,9 @@
       left join department d on b.order_dep =d.id
     </if>
     where  b.delete_sign in (0,2) and b.approval in (0,1,2)
+    <if test="shiroType ==0">
+      and a.process_status in (0,1,2,3)
+    </if>
     <if test="shiroType ==1">
       and a.process_status in (1,2,3,4)
       and b.salesman_id = #{aid}
@@ -1811,6 +1814,9 @@
         left join department d on b.order_dep =d.id
       </if>
       where  b.delete_sign in (0,2) and b.approval in (0,1,2)
+      <if test="shiroType ==0">
+        and a.process_status in (0,1,2,3)
+      </if>
       <if test="shiroType ==1">
         and a.process_status in (1,2,3,4)
         and b.salesman_id = #{aid}

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

@@ -1272,7 +1272,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		int counts =l.size();
 		int x=0;
 		for (TOrderTaskBo t : l) {
-			if (t.getTaskStatus()==0)x++;
+			if (t.getTaskStatus()>0)x++;
 		}
 		TOrderNew n = new TOrderNew();
 		n.setOrderNo(b.getOrderNo());