diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java index f757e4a093..aa57bdccb5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java @@ -25,13 +25,10 @@ *********************************************************/ package com.yxt.anrui.base.api.baseaccadjapply; -import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto; -import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery; -import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto; +import com.yxt.anrui.base.api.baseaccadjapply.flow.*; import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyCompleteDto; -import com.yxt.anrui.base.api.busvehicleapply.flow.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -113,8 +110,8 @@ public interface BaseAccadjApplyFeign { ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); @ApiOperation(value = "获取下一个环节") - @GetMapping(value = "/getNextNodesForSubmit") - ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); + @PostMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query); @ApiOperation(value = "驳回任务") @PostMapping(value = "/reject") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java index 75f1d8076b..c7c7731840 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java @@ -54,75 +54,75 @@ import java.util.List; @Component public class BaseAccadjApplyFeignFallback implements BaseAccadjApplyFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-base/baseaccadjapply/listPage无法访问"); - } - - @Override - public ResultBean save(BaseAccadjApplyDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-base/baseaccadjapply/fetchDetailsBySid无法访问"); - } - - @Override - public ResultBean> fetchVeh(PagerQuery pq) { - return null; - } - - @Override - public ResultBean submitAccAdjApply(SubmitBaseAccAdjApplyDto dto) { - return null; - } - - @Override - public ResultBean complete(BaseAccAdjApplyCompleteDto query) { - return null; - } - - @Override - public ResultBean InitiatorToAnswer(BaseAccAdjApplyCompleteDto query) { - return null; - } - - @Override - public ResultBean companyToFinancialCenter(BaseAccAdjApplyCompleteDto query) { - return null; - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return null; - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return null; - } - - @Override - public ResultBean taskReject(BaseAccAdjApplyTaskQuery query) { - return null; - } - - @Override - public ResultBean revokeProcess(BaseAccAdjApplyTaskQuery query) { - return null; - } - - @Override - public ResultBean breakProcess(BaseAccAdjApplyTaskQuery query) { - return null; - } + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/baseaccadjapply/listPage无法访问"); + } + + @Override + public ResultBean save(BaseAccadjApplyDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/save无法访问"); + } + + @Override + public ResultBean delBySids(String[] sids) { + return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/baseaccadjapply/fetchDetailsBySid无法访问"); + } + + @Override + public ResultBean> fetchVeh(PagerQuery pq) { + return null; + } + + @Override + public ResultBean submitAccAdjApply(SubmitBaseAccAdjApplyDto dto) { + return null; + } + + @Override + public ResultBean complete(BaseAccAdjApplyCompleteDto query) { + return null; + } + + @Override + public ResultBean InitiatorToAnswer(BaseAccAdjApplyCompleteDto query) { + return null; + } + + @Override + public ResultBean companyToFinancialCenter(BaseAccAdjApplyCompleteDto query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForReject(com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery query) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmit(com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery query) { + return null; + } + + @Override + public ResultBean taskReject(BaseAccAdjApplyTaskQuery query) { + return null; + } + + @Override + public ResultBean revokeProcess(BaseAccAdjApplyTaskQuery query) { + return null; + } + + @Override + public ResultBean breakProcess(BaseAccAdjApplyTaskQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java index 38a55e1937..c282c3d020 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java @@ -1,10 +1,12 @@ package com.yxt.anrui.base.api.baseaccadjapply.flow; +import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.List; import java.util.Map; /** @@ -20,6 +22,6 @@ public class GetNodeQuery implements Query { @NotBlank(message = "参数错误：taskDefKey") private String taskDefKey; - @ApiModelProperty(value = "分支字段及业务字段") - private Map formVariables; + @ApiModelProperty("调账车辆列表") + private List baseInternalPurchaseVehicles; // 调账车辆列表 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java index 2d84a7b33e..fd6746111a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java @@ -7,6 +7,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.util.List; +import java.util.Map; /** * @Author dimengzhe @@ -21,9 +22,8 @@ public class GetNodeQuery implements Query { private String taskDefKey; @ApiModelProperty(value = "业务sid") private String businessSid; - @ApiModelProperty("调账车辆列表") - private List baseInternalPurchaseVehicles; // 调账车辆列表 - /* @ApiModelProperty(value = "分支字段及业务字段") - private Map formVariables;*/ + + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java index 49e1f486c9..d286b862ec 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java @@ -27,12 +27,8 @@ package com.yxt.anrui.base.biz.baseaccadjapply; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.baseaccadjapply.*; -import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto; -import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery; -import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto; +import com.yxt.anrui.base.api.baseaccadjapply.flow.*; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; -import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery; -import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.core.query.PagerQuery; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index b6195b47c9..8e67dd2954 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -28,16 +28,17 @@ package com.yxt.anrui.base.biz.baseaccadjapply; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.baseaccadjapply.*; import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery; +import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery; +import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo; import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto; import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; -import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery; -import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService; import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; @@ -45,6 +46,7 @@ import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.KingDeeResult; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; +import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -318,7 +320,7 @@ public class BaseAccadjApplyService extends MybatisBaseService baseInternalPurchaseVehicles = new ArrayList<>(); - return complete(bv,baseInternalPurchaseVehicles); + return complete(bv, baseInternalPurchaseVehicles); } return rb; } @@ -361,26 +363,33 @@ public class BaseAccadjApplyService extends MybatisBaseService baseInternalPurchaseVehicles) { + public ResultBean complete(BusinessVariables bv, List baseInternalPurchaseVehicles) { ResultBean rb = ResultBean.fireFail(); BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid()); String callInOrgSid = baseAccadjApply.getCallInOrgSid(); String callOutOrgSid = baseAccadjApply.getCallOutOrgSid(); List purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); Boolean i = false; - if (baseInternalPurchaseVehicles.size() > 0){ - for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) { - String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); - String sid = baseInternalPurchaseVehicle.getSid(); - BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid); - String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney(); - if (!witPinMoney.equals(witPinMoney1)){ - i = true; - break; + if (baseInternalPurchaseVehicles != null){ + if (baseInternalPurchaseVehicles.size() > 0) { + for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) { + String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); + String sid = baseInternalPurchaseVehicle.getSid(); + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid); + String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney(); + if (!witPinMoney.equals(witPinMoney1)) { + i = true; + break; + } } } } - bv.getFormVariables().put("isAdj",i); + Map map = new HashMap<>(); + Map formVariables = bv.getFormVariables(); + if (formVariables == null){ + map.put("isAdj", i); + bv.setFormVariables(map); + } if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -395,8 +404,67 @@ public class BaseAccadjApplyService extends MybatisBaseService stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); + List baseInternalPurchaseVehicles1 = new ArrayList<>(); + for (String s : stringList) { + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s); + baseInternalPurchaseVehicles1.add(baseInternalPurchaseVehicle); + } + //推送金蝶采购退库单 + StkInStock stkInStock=new StkInStock(); + /** + * // 入库日期:FDate (必填项) + */ + stkInStock.setFDate(DateUtil.now()); + /** + * // 采购部门:FPurchaseDeptId (必填项) + */ + stkInStock.setFPurchaseDeptId("05.04"); + /** + * //采购组织:FPurchaseOrgId (必填项) + */ + stkInStock.setFPurchaseOrgId("100012"); + /** + * // 供应商:FSupplierId (必填项) + */ + stkInStock.setFSupplierId("010001"); + /** + * //分配目标组织:TOrgId (必填项) + */ + stkInStock.setTOrgId("100012"); + /** + * // 物料列表:FInStockEntry (必填项) + */ + List fInStockEntry=new ArrayList<>(); + for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles1) { + StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry(); + /** + * 车辆类型 + */ + sf.setCllx("03"); + /** + * // 批号:FLot + */ + sf.setFLot("11112222"); + /** + * // 物料编码:FMaterialId (必填项) + */ + sf.setFMaterialId(baseInternalPurchaseVehicle.getVinNo()); + /** + * // 仓库:FStockId + */ + sf.setFStockId("CK001"); + /** + * 物料分组 + */ + sf.setWlfz("01"); + fInStockEntry.add(sf); + } + stkInStock.setFInStockEntry(fInStockEntry); + finKingDeeFeign.draftStkInStock(stkInStock); + //推送金蝶销售出库单 SalOutStock salOutStock = createSalOutStock(baseAccadjApply); - ResultBean> listResultBean = finKingDeeFeign.draftSalOutStock(salOutStock); + finKingDeeFeign.draftSalOutStock(salOutStock); } catch (Exception e) { e.printStackTrace(); } @@ -411,6 +479,12 @@ public class BaseAccadjApplyService extends MybatisBaseService stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); + List baseInternalPurchaseVehicles = new ArrayList<>(); + for (String s : stringList) { + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s); + baseInternalPurchaseVehicles.add(baseInternalPurchaseVehicle); + } /** * 日期:FDate (必填项) */ @@ -433,37 +507,39 @@ public class BaseAccadjApplyService extends MybatisBaseService fEntity = new ArrayList<>(); - - SalOutStock.FEntity fe = new SalOutStock.FEntity(); - /** - * 物料编码:FMaterialID - */ - fe.setFMaterialID(" JX091054"); - /** - * 库存单位:FUnitID (必填项) - */ - fe.setFUnitID("liang"); - /** - * 实发数量:FRealQty - */ - fe.setFRealQty(1.0); - /** - * 批号:FLot - */ - fe.setFlot("1233321"); - /** - * 货主:FOwnerID (必填项) - */ - fe.setFOwnerID("101"); - /** - * 仓库:FStockID - */ - fe.setFStockID("CK001"); - /** - * 库存状态:FStockStatusID - */ - fe.setFStockStatusID("KCZT01_SYS"); - fEntity.add(fe); + for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) { + SalOutStock.FEntity fe = new SalOutStock.FEntity(); + /** + * 物料编码:FMaterialID + */ + fe.setFMaterialID(" JX091054"); + /** + * 库存单位:FUnitID (必填项) + */ + fe.setFUnitID("liang"); + /** + * 实发数量:FRealQty + */ + fe.setFRealQty(1.0); + /** + * 批号:FLot + */ + fe.setFlot("1233321"); + /** + * 货主:FOwnerID (必填项) + */ + fe.setFOwnerID("101"); + /** + * 仓库:FStockID + */ + //fe.setFStockID("CK001"); + fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid()); + /** + * 库存状态:FStockStatusID + */ + fe.setFStockStatusID("KCZT01_SYS"); + fEntity.add(fe); + } salOutStock.setFEntity(fEntity); return salOutStock; } @@ -579,19 +655,19 @@ public class BaseAccadjApplyService extends MybatisBaseService baseInternalPurchaseVehicles = query.getBaseInternalPurchaseVehicles(); Boolean i = false; - if (baseInternalPurchaseVehicles.size() > 0){ + if (baseInternalPurchaseVehicles.size() > 0) { for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) { String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); String sid = baseInternalPurchaseVehicle.getSid(); BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid); String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney(); - if (!witPinMoney.equals(witPinMoney1)){ + if (!witPinMoney.equals(witPinMoney1)) { i = true; break; } } } - bv.getFormVariables().put("isAdj",i); + bv.getFormVariables().put("isAdj", i); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 3236fa5f6b..b503e0e584 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.base.biz.baseoutsourcingapplication; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -529,26 +530,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService> nextNodesForSubmit = getNextNodesForSubmit(dto); - List datas = nextNodesForSubmit.getData(); - GetNodeVo getNodeVo = datas.get(0); - List candidateGroups = getNodeVo.getCandidateGroups(); - UserQuery userQuery = new UserQuery(); - userQuery.setRoleSid(candidateGroups.get(0)); - userQuery.setOrgSidPath(bv.getOrgSidPath()); - List sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); - ResultBean rb = flowableFeign.handleProsess(bv); - if(sysUserVos.size()==0){ - bv.setTaskDefKey(rb.getData().getTaskDefKey()); - bv.setTaskId(rb.getData().getTaskId()); - return complete(bv); - }*/ BaseOutsourcingApplicationDto dto= baseMapper.getBySid(bv.getBusinessSid()); ResultBean rb = complete_handleProsess(bv,dto); - /* String taskDefKey = rb.getData().getTaskDefKey(); + String taskDefKey = rb.getData().getTaskDefKey(); Map stringObjectMap = BeanUtil.beanToMap(rb.getData()); updateFlowFiled(stringObjectMap); + if ("Event_end".equals(taskDefKey)) { BigDecimal deposit = booad.getDeposit(); if ("1".equals(booad.getIsBeforePayment())) { @@ -573,12 +560,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); -// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); //======================添加消息推送结束 } -*/ + return rb; } else { return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!"); @@ -605,15 +591,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService complete_handleProsess(BusinessVariables bv, BaseOutsourcingApplicationDto dto) { - ResultBean> nextNodesForSubmit = getNextNodesForSubmit(dto); - List datas = nextNodesForSubmit.getData(); - GetNodeVo getNodeVo = datas.get(0); - List candidateGroups = getNodeVo.getCandidateGroups(); ResultBean rb = flowableFeign.handleProsess(bv); Map stringObjectMap = BeanUtil.beanToMap(rb.getData()); updateFlowFiled(stringObjectMap); //消息推送===========开始 - UpdateFlowFieldVo uff = rb.getData(); + /* UpdateFlowFieldVo uff = rb.getData(); if (!"Event_end".equals(uff.getTaskDefKey())) { BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(bv.getBusinessSid()); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); @@ -628,7 +610,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - } + }*/ //消息推送结束===== return rb; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index e334c99827..b1ad0a3135 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -264,6 +264,7 @@ public class BusVehicleOrderService extends MybatisBaseService