销售订单-办理同意最后一步时更新销售订单为已通过的状态、终止流程最后一步更新未通过的状态

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(业务管理) <br/>
  * File: BusSalesOrderMapper.java <br/>
@@ -54,12 +52,14 @@ import java.util.List;
 public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
 
     IPage<BusSalesOrderVo> selectPageVo(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrder> 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<BusSalesOrder> {
      * @return
      */
     AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid);
+
+    /**
+     * 根据销售订单sid更新销售订单的状态
+     *
+     * @param state       状态：审批通过1，不通过2
+     * @param businessSid 销售订单sid
+     */
+    void updateStateByBusinessSid(@Param("state") int state, @Param("businessSid") String businessSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -5,23 +5,23 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo">
         SELECT bo.sid,
-        bo.nodeState,
-        bo.billNo,
-        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
-        bo.customerName,
-        bo.mobile,
-        bm.brandName,
-        bp.singleFinalPrice,
-        bp.quantity,
-        bo.payType,
-        bd.depositAll,
-        case bo.isInsurance
-        when 0 then '否'
-        when 1 then '是' end as isInsurance
+               bo.nodeState,
+               bo.billNo,
+               DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
+               bo.customerName,
+               bo.mobile,
+               bm.brandName,
+               bp.singleFinalPrice,
+               bp.quantity,
+               bo.payType,
+               bd.depositAll,
+               case bo.isInsurance
+                   when 0 then '否'
+                   when 1 then '是' end                as isInsurance
         FROM bus_sales_order bo
-        left join bus_sales_order_model bm on bm.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
+                 left join bus_sales_order_model bm on bm.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
         <where>
             ${ew.sqlSegment}
         </where>
@@ -37,24 +37,24 @@
     </update>
     <!--app查询销售订单列表-->
     <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo">
-        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
         <where>
             ${ew.sqlSegment}
         </where>
@@ -81,4 +81,10 @@
         FROM bus_sales_order bo
         WHERE bo.sid = #{saleOrderSid}
     </select>
+    <!--根据销售订单sid更新销售订单的状态-->
+    <update id="updateStateByBusinessSid">
+        update bus_sales_order
+        set state = #{state}
+        where sid = #{businessSid}
+    </update>
 </mapper>

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<BusSalesOrderMapper
                 nodeState = ProcessStateEnum.FINISHED.getStateName();
                 taskDefKey = "Event_end";
                 map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
+                //更新销售订单的状态为已通过的状态:审批通过1
+                //ToDo:
+                updateStateByBusinessSid(1,variables.get("businessSid").toString());
+
+
+
             }
         }
         map.put("nodeState", nodeState);
@@ -739,6 +745,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success();
     }
 
+    /**
+     * 更新销售订单的状态
+     * @param state 状态，审批通过1，不通过2
+     * @param businessSid
+     */
+    private void updateStateByBusinessSid(int state, String businessSid) {
+        baseMapper.updateStateByBusinessSid(state,businessSid);
+    }
+
     public ResultBean reject(BusSalesOrderFlowDto dto) {
         FlowTaskVo flowTaskVo = new FlowTaskVo();
         BeanUtil.copyProperties(dto, flowTaskVo);
@@ -763,6 +778,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public ResultBean breakProcess(BusSalesOrderFlowDto dto) {
         FlowTaskVo flowTaskVo = new FlowTaskVo();
         BeanUtil.copyProperties(dto, flowTaskVo);
+        //查询是否是最后一步
+        ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(dto.getInstanceId());
+        if (listResultBean.getData().size() == 0) {
+            //更新销售订单的状态为不通过
+            updateStateByBusinessSid(2,dto.getBusinessSid());
+        }
         ResultBean resultBean = flowTaskFeign.breakProcess(flowTaskVo);
         if (!resultBean.getSuccess()) {
             return resultBean;