Quellcode durchsuchen

订单列表修改

anderx vor 1 Jahr
Ursprung
Commit
78dadfb32d

+ 12 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -604,9 +604,19 @@
         date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.patent_cost patentCost,a.patent_cost_actual patentCostActual ,
         a.soft_cost softCost ,a.soft_cost_actual softCostActual ,a.audit_cost auditCost ,a.audit_cost_actual auditCostActual ,a.other_cost otherCost ,
         a.other_cost_actual otherCostActual , a.expect_profit expectProfit ,a.actual_profit  actualProfit,a.service_type serviceType,
-        a.service_project serviceProject,o.examine_name examineName
+        a.service_project serviceProject,o.examine_name examineName,toa.type,toa.type_explain typeExplain
         from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
-        left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and o.approval in(0,1,2,4,5,7,8)
+        left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no
+        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 o.order_no=toa.order_no
+        where delete_sign in(0,2) and o.approval in(0,1,2,4,5,7,8)
         and outsource=  #{o.outsource,jdbcType=INTEGER}
         <if test="o.processStatus == 3">
             and o.process_status = #{o.processStatus,jdbcType=INTEGER}

+ 21 - 3
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -1,10 +1,9 @@
 package com.goafanti.order.bo;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 import com.goafanti.common.utils.excel.Excel;
 
+import java.math.BigDecimal;
+
 
 /**
  * 订单列表
@@ -153,6 +152,25 @@ public class OrderListBo {
 
 	private Integer myExamine;
 
+	private String type;
+	private String typeExplain;
+
+	public String getTypeExplain() {
+		return typeExplain;
+	}
+
+	public void setTypeExplain(String typeExplain) {
+		this.typeExplain = typeExplain;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
 	public Integer getMyExamine() {
 		return myExamine;
 	}