优化未售买断终止

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

@@ -812,7 +812,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         BaseVehicleActualSales baseVehicleActualSales = fetchBySid(query.getBusinessSid());
         String businessTaskId = baseVehicleActualSales.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
-            if (businessTaskId.equals(query.getTaskId())) {
+            if(query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())){
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -826,7 +826,24 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
                 updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
                 return rb.success().setData(resultBean.getData());
+            }else{
+                if (businessTaskId.equals(query.getTaskId())) {
+                    FlowTaskVo flowTaskVo = new FlowTaskVo();
+                    BeanUtil.copyProperties(query, flowTaskVo);
+                    ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    Map<String, Object> paramMap = BeanUtil.beanToMap(resultBean.getData());
+                    updateFlowFiled(paramMap);
+                    //更新车辆状态为未买断
+                    String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
+                    String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
+                    updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
+                    return rb.success().setData(resultBean.getData());
+                }
             }
+
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }