Browse Source

科德业务管理系统外包列表新增财务负责人、外包成本

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
1ae076a083

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

@@ -1079,9 +1079,9 @@
   </select>
   <!-- 财务专员查看需要待收款的数据 -->
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
-  	select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a1.name financeName,
+  		select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a1.name financeName,
 	o.process_status as processStatus, ifnull(b.amount, 0) as actuallyTotalAmount, o.contract_no as contractNo, o.approval, 
-	a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,
+	a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,too.amount outsourceAmount,
 	o.first_amount as signFirstPayment, o.total_amount as signTotalAmount, date_format(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime,
 	e.name as outsourceName, 0 as companyId, "湖南科德信息咨询有限公司" as companyName, d.name as departmentName, f.transaction_amount finalReceivables ,
 	date_format(f.create_time, '%Y-%m-%d %H:%i:%s')finalReceivablesTime, g.invoiceAmount from t_order_new o 
@@ -1090,7 +1090,7 @@ left join admin a1 on 	d.finance_id = a1.id left join ( select sum(transaction_a
 on b.order_no = o.order_no left join ( select order_no, max(name) as name from outsource_organization group by order_no) e on o.order_no = e.order_no
 left join (select x1.order_no,max(create_time) create_time,max(transaction_amount)transaction_amount from 
 (select x.order_no,x.create_time,x.transaction_amount from t_order_bill_new x right join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y
-	on  x.order_no=y.order_no and x.create_time=y.maxTime)x1 group by x1.order_no ) f on o.order_no = f.order_no
+	on  x.order_no=y.order_no and x.create_time=y.maxTime)x1 group by x1.order_no ) f on o.order_no = f.order_no left join t_order_outsource too on o.order_no=too.order_no
 left join ( select order_no , sum(amount) invoiceAmount from t_order_invoice where status = 2 group by order_no ) g on o.order_no = g.order_no
 where delete_sign != 1 and (approval = 0 or approval = 2) and outsource=  #{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">

+ 8 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -86,6 +86,8 @@ public class OrderListBo {
 	private String endFinalReceivablesTime;
 	/** 开始最后收款 时间*/
 	private String startFinalReceivablesTime;	
+	/** 外包金额*/
+	private String outsourceAmount;
 	
 	public String getFinalReceivables() {
 		return finalReceivables;
@@ -327,4 +329,10 @@ public class OrderListBo {
 	public void setStartFinalReceivablesTime(String startFinalReceivablesTime) {
 		this.startFinalReceivablesTime = startFinalReceivablesTime;
 	}
+	public String getOutsourceAmount() {
+		return outsourceAmount;
+	}
+	public void setOutsourceAmount(String outsourceAmount) {
+		this.outsourceAmount = outsourceAmount;
+	}
 }