From 17b3a9b70565ed9cbf4744ab5ae069d057bae415 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 17 May 2022 09:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E5=8A=9E?= =?UTF-8?q?=E7=90=86=E5=90=8C=E6=84=8F=E6=9C=80=E5=90=8E=E4=B8=80=E6=AD=A5?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E9=80=9A=E8=BF=87=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=81=E7=BB=88=E6=AD=A2=E6=B5=81=E7=A8=8B=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E6=AD=A5=E6=9B=B4=E6=96=B0=E6=9C=AA=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderMapper.java | 14 +++- .../biz/bussalesorder/BusSalesOrderMapper.xml | 72 ++++++++++--------- .../bussalesorder/BusSalesOrderService.java | 21 ++++++ 3 files changed, 71 insertions(+), 36 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index ad2471389d..6efc846707 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -35,8 +35,6 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; -import java.util.List; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderMapper.java
@@ -54,12 +52,14 @@ import java.util.List; public interface BusSalesOrderMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + void modifyFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String procDefId, @Param("nodeState") String nodeState, @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid); @Update("update bus_sales_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}") - int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid,@Param("oneBillMoney") String oneBillMoney); + int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid, @Param("oneBillMoney") String oneBillMoney); + /** * App销售订单分页列表 * @@ -84,4 +84,12 @@ public interface BusSalesOrderMapper extends BaseMapper { * @return */ AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid); + + /** + * 根据销售订单sid更新销售订单的状态 + * + * @param state 状态：审批通过1，不通过2 + * @param businessSid 销售订单sid + */ + void updateStateByBusinessSid(@Param("state") int state, @Param("businessSid") String businessSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 5ccc4514b8..555a79f4ed 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -5,23 +5,23 @@ - SELECT bo.sid AS saleOrderSid, - bo.billNo AS saleOrderId, - bo.customerClass AS customerType, - bo.customerSid, - bo.customerName, - bo.customerPhoto AS customerImage, - bo.mobile, - bo.payType AS carPurchaseType, - bo.payTypeKey AS carPurchaseKey, - bd.depositAll AS deposit, - bo.nodeState AS saleOrderState, - DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate, - case bo.isInsurance - when 0 then '否' - when 1 then '是' end as insuranceInfo + SELECT bo.sid AS saleOrderSid, + bo.billNo AS saleOrderId, + bo.customerClass AS customerType, + bo.customerSid, + bo.customerName, + bo.customerPhoto AS customerImage, + bo.mobile, + bo.payType AS carPurchaseType, + bo.payTypeKey AS carPurchaseKey, + bd.depositAll AS deposit, + bo.nodeState AS saleOrderState, + DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate, + case bo.isInsurance + when 0 then '否' + when 1 then '是' end as insuranceInfo FROM bus_sales_order bo - left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid - left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid + left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid + left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid ${ew.sqlSegment} @@ -81,4 +81,10 @@ FROM bus_sales_order bo WHERE bo.sid = #{saleOrderSid} + + + update bus_sales_order + set state = #{state} + where sid = #{businessSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 0b17400086..b91c2be725 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -731,6 +731,12 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(dto.getInstanceId()); + if (listResultBean.getData().size() == 0) { + //更新销售订单的状态为不通过 + updateStateByBusinessSid(2,dto.getBusinessSid()); + } ResultBean resultBean = flowTaskFeign.breakProcess(flowTaskVo); if (!resultBean.getSuccess()) { return resultBean;