yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化工作

master
God 2 years ago
parent
79bc072e03
commit
b2c4c654bf
11 changed files with 292 additions and 152 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  2. 85
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  3. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
  4. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java
  5. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
  6. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
  7. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  8. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
  9. 72
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
  10. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
  11. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -74,6 +74,7 @@ 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.flow2.FlowFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTask;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -164,6 +165,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
BaseVehicleModelService baseVehicleModelService;
@Autowired
private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<BaseAccadjApply> createQueryWrapper(BaseAccadjApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -385,7 +388,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
//流程定义id
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());
}
@ -490,7 +493,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -872,7 +875,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
}
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -940,7 +943,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg());
}

85
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -31,6 +31,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.baseinternalpurchase.*;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo;
@ -53,6 +54,7 @@ import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
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;
@ -87,6 +89,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
/**
@ -129,6 +132,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
private AppSubsetVersionFeign appSubsetVersionFeign;
@Autowired
private MessageFeign messageFeign;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<BaseInternalPurchase> createQueryWrapper(BaseInternalPurchaseQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -361,7 +366,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
//流程定义id
bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicleDto : baseInternalPurchaseVehicles) {
@ -492,7 +497,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
variables.put("app", appMap);
bv.setFormVariables(variables);
bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -568,18 +573,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
//极光推送
UpdateFlowFieldVo ufVo = resultBean.getData();
baseInternalPurchase = fetchBySid(bv.getBusinessSid());
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BaseInternalPurchase finalBaseInternalPurchase = baseInternalPurchase;
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(finalBaseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(finalBaseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("分公司间调车申请");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(finalBaseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("分公司间调车");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
}
return rb.success().setData(resultBean.getData());
} else {
@ -666,7 +683,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -674,18 +691,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
//极光推送
UpdateFlowFieldVo ufVo = resultBean.getData();
baseInternalPurchase = fetchBySid(bv.getBusinessSid());
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BaseInternalPurchase finalBaseInternalPurchase = baseInternalPurchase;
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(finalBaseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(finalBaseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("分公司间调车申请");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(finalBaseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("分公司间调车");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
@ -721,7 +750,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg());
}
@ -729,18 +758,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
//极光推送
UpdateFlowFieldVo ufVo = resultBean1.getData();
baseInternalPurchase = fetchBySid(bv.getBusinessSid());
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BaseInternalPurchase finalBaseInternalPurchase = baseInternalPurchase;
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(finalBaseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(finalBaseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("分公司间调车申请");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(finalBaseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("分公司间调车");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success().setData(resultBean1.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
@ -803,12 +844,20 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
UpdateFlowFieldVo ufVo = resultBean.getData();
String businessSid = query.getBusinessSid();
baseInternalPurchase = fetchBySid(businessSid);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BaseInternalPurchase finalBaseInternalPurchase = baseInternalPurchase;
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseInternalPurchase.getProcInstId();
String procId = finalBaseInternalPurchase.getProcInstId();
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcDefId(finalBaseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -821,11 +870,15 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(finalBaseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("分公司间调车");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success();
}
}

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
View File

@ -46,6 +46,7 @@ import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateServi
import com.yxt.anrui.base.common.enums.VehicleState;
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.utils.ProcDefEnum;
@ -102,6 +103,8 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
private FlowTaskFeign flowTaskFeign;
@Autowired
private BaseVehicleCertificateService baseVehicleCertificateService;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<BaseShuntingInvoicingApply> createQueryWrapper(BaseShuntingInvoicingApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -283,7 +286,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
//流程定义id
bv.setModelId(ProcDefEnum.BASESHUNINVOICAPPLY.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());
}
@ -361,7 +364,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(bv.getBusinessSid());
List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehDetailsVos = baseShuntingInvoicinApplyeVehService.fetchByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(baseShuntingInvoicingApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -411,7 +414,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
private ResultBean handleProcess(BusinessVariables bv, ResultBean rb, BaseShuntingInvoicingApply baseShuntingInvoicingApply) {
List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehDetailsVos = baseShuntingInvoicinApplyeVehService.fetchByMainSid(baseShuntingInvoicingApply.getSid());
if (bv.getTaskId().equals(baseShuntingInvoicingApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java
View File

@ -43,6 +43,7 @@ import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import com.yxt.anrui.base.biz.basevehinstallmodpricedetail.BaseVehinstallModpricedetailService;
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.utils.ProcDefEnum;
@ -97,6 +98,8 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
private FlowTaskFeign flowTaskFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<BaseVehinstallModprice> createQueryWrapper(BaseVehinstallModpriceQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -268,7 +271,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
//流程定义id
bv.setModelId(ProcDefEnum.BASEVEHINSTALLMODPRICE.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
@ -324,7 +327,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
BaseVehinstallModprice baseVehinstallModprice = fetchBySid(bv.getBusinessSid());
List<BaseVehinstallModpricedetailDetailsVo> baseVehinstallModpricedetailDetailsVos = baseVehinstallModpricedetailService.fetchByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(baseVehinstallModprice.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
View File

@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -91,6 +92,8 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
private FlowTaskFeign flowTaskFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<ScmCollectionrebateCheckapply> createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -295,7 +298,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
//流程定义id
bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATECHECKAPPLY.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
@ -350,7 +353,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
ResultBean rb = ResultBean.fireFail();
ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmCollectionrebateCheckapply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
View File

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -103,6 +104,8 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
private FlowTaskFeign flowTaskFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<ScmCollectionRebateWithApply> createQueryWrapper(ScmCollectionRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -282,7 +285,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
}
}
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
@ -338,7 +341,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(bv.getBusinessSid());
List<String> collectionRebateSids = scmCollectionRebateWithService.fetchCollectionReBateSidByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmCollectionRebateWithApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
View File

@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -92,6 +93,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
private FlowTaskFeign flowTaskFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<ScmSpecialrebateCheckapply> createQueryWrapper(ScmSpecialrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -313,7 +316,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
//流程定义id
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
@ -368,7 +371,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
ResultBean rb = ResultBean.fireFail();
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmSpecialrebateCheckapply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
View File

@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
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.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -94,6 +95,8 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
private FlowTaskFeign flowTaskFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<ScmSpecialRebateWithApply> createQueryWrapper(ScmSpecialRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -276,7 +279,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
}
}
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
@ -333,7 +336,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid());
List<String> specialRebateSids = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmSpecialRebateWithApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}

72
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto;
import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign;
import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
@ -17,8 +18,10 @@ import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
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;
@ -56,6 +59,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
/**
@ -87,6 +91,8 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
private MessageFeign messageFeign;
@Autowired
private SysProUrlFeign sysProUrlFeign;
@Autowired
private FlowFeign flowFeign;
/**
* 采购退库新增编辑
@ -243,7 +249,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
//如果taskid从业务的数据库中查询出来，那这个taskid 和当前的关系是什么 如果数据库中查询出来的taskid是第四个环节的id,但是目前是做的第一次的提交操作。
// 应该是也不允许走if 也不运行走else 那应该如何验证这个id是否允许走else呢？
// 取出来业务数据的taskid和前端传递的taskid作比较 来判断数据的是否有效 本质上是数据版本一致性的问题
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.startProcess(bv);
UpdateFlowFieldVo uff = resultBean1.getData();
updateFlowFiled(BeanUtil.beanToMap(uff));
//BaseVehicleUpdateQuery baseVehicleUpdateQuery = new BaseVehicleUpdateQuery();
@ -251,6 +257,13 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
updateVehicleState(detailsList, scmVehicleReturnDto);
//极光推送
ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
@ -261,6 +274,10 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("采购退库");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return resultBean1;
}
return submitBusinessData(scmVehicleReturnDto, busSid, variables);
@ -289,11 +306,18 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
if (org.apache.commons.lang3.StringUtils.isBlank(businessTaskid) && org.apache.commons.lang3.StringUtils.isBlank(dto.getTaskId())) {
updateVehicleState(detailsList, booad);
saveOrUpdateVehicleReturn(dto);//update
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.startProcess(bv);
UpdateFlowFieldVo uff = resultBean1.getData();
updateFlowFiled(BeanUtil.beanToMap(uff));
//极光推送
ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
@ -304,7 +328,10 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("采购退库");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(uff, appMap, scmVehicleReturn);
});
} catch (Exception e) {
e.printStackTrace();
}
return resultBean1;
} else if (org.apache.commons.lang3.StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
updateVehicleState(detailsList, booad);
@ -312,11 +339,18 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
bv.setTaskDefKey(booad.getTaskDefKey());
bv.setComment(org.apache.commons.lang3.StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(booad.getInstanceId());
ResultBean<UpdateFlowFieldVo> rrb = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> rrb = flowFeign.handleProsess(bv);
updateFlowFiled(BeanUtil.beanToMap(rrb.getData()));
//极光推送
UpdateFlowFieldVo uff = rrb.getData();
ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
@ -329,6 +363,10 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("采购退库");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return rrb;
} else {
return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
@ -374,7 +412,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
bv.getFormVariables().put("app", appMap);
ResultBean<UpdateFlowFieldVo> rb1 = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> rb1 = flowFeign.handleProsess(bv);
if (!rb1.getSuccess()) {
return rb.setMsg(rb1.getMsg());
}
@ -424,6 +462,13 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
UpdateFlowFieldVo uff = rb1.getData();
ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
uff.setProcInsId(scmVehicleReturn.getInstanceId());
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
@ -436,6 +481,10 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("采购退库");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
}
return rb1;
} else {
@ -471,7 +520,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);*/
if (bv.getTaskId().equals(scmVehicleReturn.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg());
}
@ -772,6 +821,13 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
//极光推送
UpdateFlowFieldVo uff = resultBean.getData();
ScmVehicleReturn scmVehicleReturn = fetchBySid(flowTaskVo.getBusinessSid());
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
@ -794,6 +850,10 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
}
messageFlowableQuery.setMsgTitle("采购退库");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return resultBean;
} else {
return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
View File

@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -91,6 +92,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
private FlowTaskFeign flowTaskFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<ScmVehrebateCheckapply> createQueryWrapper(ScmVehrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -319,7 +322,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
//流程定义id
bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
@ -374,7 +377,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
ResultBean rb = ResultBean.fireFail();
ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmVehrebateCheckapply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
View File

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -94,6 +95,8 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
private FlowTaskFeign flowTaskFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<ScmVehRebateWithApply> createQueryWrapper(ScmVehRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -284,7 +287,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
}
}
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
@ -340,7 +343,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(bv.getBusinessSid());
List<String> vehRebateSids = scmVehRebateWithService.fetchVehReBateSidByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmVehRebateWithApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}

Write Preview
Loading…
Cancel
Save