|
|
@@ -1080,16 +1080,14 @@
|
|
|
<!-- 财务专员查看需要待收款的数据 -->
|
|
|
<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,a.finance_name financeName,
|
|
|
- o.process_status as processStatus, ifnull(b.amount, 0) as actuallyTotalAmount, o.contract_no as contractNo, o.approval,
|
|
|
+ o.process_status as processStatus, o.settlement_amount as actuallyTotalAmount, o.contract_no as contractNo, o.approval,
|
|
|
a.salesman_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, d.name as departmentName, a.final_receivables finalReceivables ,
|
|
|
- date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime, g.invoiceAmount from t_order_new o
|
|
|
+ too.company_name as outsourceName, 0 as companyId, d.name as departmentName, a.final_receivables finalReceivables ,
|
|
|
+ date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.invoice_amount invoiceAmount 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 sum(transaction_amount) as amount , order_no from t_order_bill_new group by order_no ) b
|
|
|
-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 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}
|
|
|
+left join t_order_outsource too on o.order_no=too.order_no where delete_sign != 1 and (approval = 0 or approval = 2)
|
|
|
+ and outsource= #{o.outsource,jdbcType=INTEGER}
|
|
|
<if test="o.processStatus == 3">
|
|
|
and o.process_status = #{o.processStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
@@ -1112,8 +1110,8 @@ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource= #{o.ou
|
|
|
and o.order_dep = #{o.departmentId,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="o.contractNo != null and o.contractNo != """>
|
|
|
- and o.contract_no like CONCAT('%',#{o.contractNo,jdbcType=VARCHAR},'%')
|
|
|
- </if>
|
|
|
+ and o.contract_no like CONCAT('%',#{o.contractNo,jdbcType=VARCHAR},'%')
|
|
|
+ </if>
|
|
|
<if test="o.liquidationStatus != null">
|
|
|
and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
@@ -1132,7 +1130,7 @@ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource= #{o.ou
|
|
|
<if test="o.startFinalReceivablesTime != null and o.startFinalReceivablesTime != "" and o.endFinalReceivablesTime != null and o.endFinalReceivablesTime != """>
|
|
|
<bind name="c" value="o.startFinalReceivablesTime + ' 00:00:00'" />
|
|
|
<bind name="d" value="o.endFinalReceivablesTime + ' 23:59:59'" />
|
|
|
- and f.create_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
|
|
|
+ and a.final_Receivables_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
order by o.liquidation_status, o.sign_time desc
|
|
|
<if test="page_sql != null">
|
|
|
@@ -1140,11 +1138,9 @@ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource= #{o.ou
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="financeCount" parameterType="Map" resultType="java.lang.Integer">
|
|
|
- select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id
|
|
|
-left join department d on o.order_dep = d.id 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
|
|
|
- where delete_sign != 1 and (approval = 0 or approval = 2) and outsource= #{o.outsource,jdbcType=INTEGER}
|
|
|
+ select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id
|
|
|
+left join department d on o.order_dep = d.id left join t_order_mid a on o.order_no=a.order_no
|
|
|
+ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource= #{o.outsource,jdbcType=INTEGER}
|
|
|
<if test="o.processStatus == 3">
|
|
|
and o.process_status = #{o.processStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
@@ -1187,7 +1183,7 @@ left join department d on o.order_dep = d.id left join (select x1.order_no,ma
|
|
|
<if test="o.startFinalReceivablesTime != null and o.startFinalReceivablesTime != "" and o.endFinalReceivablesTime != null and o.endFinalReceivablesTime != """>
|
|
|
<bind name="c" value="o.startFinalReceivablesTime + ' 00:00:00'" />
|
|
|
<bind name="d" value="o.endFinalReceivablesTime + ' 23:59:59'" />
|
|
|
- and f.create_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
|
|
|
+ and a.final_Receivables_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
</select>
|
|
|
<!-- 通过订单编号获得订单的负责人(营销员) -->
|
|
|
@@ -1539,7 +1535,7 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
|
|
|
<select id="countTotalAndActually" parameterType="Map" resultType="java.util.Map">
|
|
|
select sum(o.settlement_amount) actuallyTotalAmount,sum(o.total_amount) signTotalAmount 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 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
|
|
|
where o.delete_sign != 1 and (o.approval = 0 or o.approval = 2) and outsource= #{o.outsource,jdbcType=INTEGER}
|
|
|
<if test="o.processStatus == 3">
|
|
|
and o.process_status = #{o.processStatus,jdbcType=INTEGER}
|
|
|
@@ -1577,9 +1573,14 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
and u.nickname like #{n,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != """>
|
|
|
- <bind name="a" value="startTime + ' 00:00:00'" />
|
|
|
- <bind name="b" value="endTime + ' 23:59:59'" />
|
|
|
+ <bind name="a" value="o.startTime + ' 00:00:00'" />
|
|
|
+ <bind name="b" value="o.endTime + ' 23:59:59'" />
|
|
|
and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="o.startFinalReceivablesTime != null and o.startFinalReceivablesTime != "" and o.endFinalReceivablesTime != null and o.endFinalReceivablesTime != """>
|
|
|
+ <bind name="c" value="o.startFinalReceivablesTime + ' 00:00:00'" />
|
|
|
+ <bind name="d" value="o.endFinalReceivablesTime + ' 23:59:59'" />
|
|
|
+ and a.final_Receivables_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
</select>
|
|
|
|