diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index e38fb16882..9712aa4088 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -58,6 +58,7 @@ import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; @@ -171,6 +172,8 @@ public class CommonContractService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); if (!voResultBean.getSuccess()) { @@ -2298,7 +2301,7 @@ public class CommonContractService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 6bcc232da2..294b5b0b6e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -1746,6 +1746,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 appMap.put("sid", businessSid); + appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); if (StringUtils.isNotBlank(dto.getIsFinance())) { variables.put("jinrong", "1".equals(dto.getIsFinance())); @@ -1902,6 +1903,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", bv.getBusinessSid()); + appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) { variables.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance())); @@ -2046,6 +2048,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", bv.getBusinessSid()); + appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); //================================= FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); @@ -2228,6 +2231,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", query.getBusinessSid()); + appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); //================================= FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); @@ -2291,6 +2295,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", query.getBusinessSid()); + appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); //================================= FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); @@ -2341,6 +2346,31 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + List vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid()); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -2352,35 +2382,36 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply; - Future future1 = pool.submit(() -> { - List dtoList = new ArrayList<>(); - List vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid()); - vinSidList.removeAll(Collections.singleton(null)); - if (!vinSidList.isEmpty()) { - vinSidList.stream().forEach(v -> { - BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); - baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey()); - baseVehicleStateDto.setBusSid(v); - dtoList.add(baseVehicleStateDto); + //==============================修改车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + List vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid()); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } }); - ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } catch (Exception e) { + e.printStackTrace(); } - }); - } catch (Exception e) { - e.printStackTrace(); + return rb.success().setData(resultBean.getData()); + } } + } return rb.setMsg("操作失败!提交的数据不一致!"); }