Merge remote-tracking branch 'origin/master' into master

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -581,6 +581,11 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
                 if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                    //更新未售买断状态为未买断
+                    //更新车辆状态为未买断
+                    String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
+                    String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
+                    updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
                 } else {
                     messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }