Explorar o código

修改项目派单显示

anderx hai 3 meses
pai
achega
6df5d21767

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

@@ -985,7 +985,7 @@
             left join admin f on e.initiate=f.id
         </if>
         <if test="specially == 4">
-            left join t_order_task  e on a.order_no=e.order_no and e.main =1
+            left join t_order_task  e on a.order_no=e.order_no
             left join (select order_no from new_order_change group by order_no)g on a.order_no=g.order_no
         </if>
         <if test="specially == 9">
@@ -1152,6 +1152,8 @@
         <if test="specially == 4">
             and a.process_status in(3,6,7,8,99)
             and a.order_status  in(1,2,3,4,6)
+            and e.main =1
+            and e.split_status in (0,1)
         </if>
         <if test="deps!=null">
             and a.order_dep in