Sfoglia il codice sorgente

订单列表修改

anderx 1 anno fa
parent
commit
d720ffaff4

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

@@ -2112,6 +2112,15 @@
     <if test="shiroType ==2 or  shiroType ==3">
       left join department d on b.order_dep =d.id
     </if>
+    inner join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
+    from t_order_approval
+    <if test="type !=null">
+      where `type` in
+      <foreach collection="type" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+    </if>
+    group by order_no) toa on b.order_no=toa.order_no
     where  b.delete_sign in (0,2)
     and a.process_status in (1,2,3,4)
     <if test="shiroType ==1">
@@ -2185,6 +2194,15 @@
     <if test="shiroType ==2 or shiroType ==3">
       left join department d on b.order_dep =d.id
     </if>
+    inner join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
+    from t_order_approval
+    <if test="type !=null">
+      where `type` in
+      <foreach collection="type" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+    </if>
+    group by order_no) toa on b.order_no=toa.order_no
     where  b.delete_sign in (0,2)
     and a.process_status in (1,2,3,4)
     <if test="shiroType ==1">

+ 9 - 2
src/main/java/com/goafanti/order/bo/InputMemberList.java

@@ -1,7 +1,5 @@
 package com.goafanti.order.bo;
 
-import java.util.List;
-
 public class InputMemberList {
     private String orderNo;
     private String userName;
@@ -17,10 +15,19 @@ public class InputMemberList {
      * 0 所有  1营销(自己)  2财务审核 3特批审核
      */
     private Integer shiroType;
+    private String type;
 
     private Integer pageSize;
     private Integer pageNo;
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public Integer getShiroType() {
         if (shiroType==null)return 1;
         return shiroType;