diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 10fee8d8b5..d21e824fb2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -3080,8 +3080,20 @@ public class FinBillApplicationService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(finalFinBillApplication.getCreateBySid())) { + if ("发起申请".equals(ufVo.getNodeState())) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + //查询销售订单信息 + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finalFinBillApplication.getContractNo()).getData(); + List finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid()); + List baseVehicleStateDtos = new ArrayList<>(); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByOrderSidAndVehSid(busSalesOrder.getSid(), finBillVehicleVo.getVehSid()).getData(); + baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid()); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey()); + baseVehicleStateDtos.add(baseVehicleStateDto); + } + baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); } else { messageFlowableQuery.setMsgContent(finalFinBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); }