Browse Source

签单客户统计部门处理

anderx 3 years ago
parent
commit
9e678eaa8a

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

@@ -463,7 +463,7 @@ select
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
 	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-	a.cw_remarks cwRemarks,a.estimate_cost estimateCost,estimate_refundable estimateRefundable,refund_Invoice refundInvoice
+	a.cw_remarks cwRemarks,a.estimate_cost estimateCost,estimate_refundable estimateRefundable,refund_Invoice refundInvoice,a.contract_picture_url contractPictureUrl
 	from new_order_change a where 1 = 1 and a.id= #{id}
   </select>
   <select id="checkOderNo" resultType="java.lang.Integer">

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -266,6 +266,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						nb.setProcessState(5);
 					}else if(nb.getProcessState()==5){
 						nb.setStatus(4);
+						pushCompleteOrderChange(nb);
 					}
 				}else {
 					if (nb.getChangeAmount().compareTo(new BigDecimal("0.2"))<0) {//小于则总裁通过,大于则董事长