Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
commit
b7b66e896f
  1. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
  2. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java
  3. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  4. 89
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
  5. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  6. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/app/AppBusMainDepositOrderVo.java
  7. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java
  8. 84
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  9. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
  10. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
  11. 17
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  12. 105
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  13. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  14. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
  15. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-pro.yml
  16. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml
  17. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  18. 164
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java
  19. 156
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  20. 7
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  21. 9
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java
  22. 9
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java
  23. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@ -23,6 +23,7 @@ import com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehServi
import com.yxt.anrui.base.biz.basevehmodellabel.BaseVehmodelLabelService; import com.yxt.anrui.base.biz.basevehmodellabel.BaseVehmodelLabelService;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
@ -80,7 +81,8 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired
private FlowFeign flowFeign;
@Autowired @Autowired
private BaseDiscountpackageVehService baseDiscountpackageVehService; private BaseDiscountpackageVehService baseDiscountpackageVehService;
@ -483,7 +485,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId()); bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId());
if (r == 1) { if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData(); UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo)); updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean; return voResultBean;
@ -551,7 +553,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
} }
if (bv.getTaskId().equals(baseDiscountpackage.getTaskId())) { if (bv.getTaskId().equals(baseDiscountpackage.getTaskId())) {
bv.setOrgSidPath(baseDiscountpackage.getOrgSidPath()); bv.setOrgSidPath(baseDiscountpackage.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java

@ -55,6 +55,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDis
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -110,6 +111,8 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
@Autowired @Autowired
private FlowTaskFeign flowTaskFeign; private FlowTaskFeign flowTaskFeign;
@Autowired @Autowired
private FlowFeign flowFeign;
@Autowired
private CommonContractService commonContractService; private CommonContractService commonContractService;
@Autowired @Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@ -450,7 +453,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
if (r == 1) { if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) { if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg()); return rb.setMsg(voResultBean.getMsg());
} }
@ -517,7 +520,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
String orgSidPath = baseDiscountpackageApply.getOrgSidPath(); String orgSidPath = baseDiscountpackageApply.getOrgSidPath();
if (bv.getTaskId().equals(baseDiscountpackageApply.getTaskId())) { if (bv.getTaskId().equals(baseDiscountpackageApply.getTaskId())) {
bv.setOrgSidPath(baseDiscountpackageApply.getOrgSidPath()); bv.setOrgSidPath(baseDiscountpackageApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@ -25,6 +25,7 @@ import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@ -93,6 +94,8 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired @Autowired
private FlowFeign flowFeign;
@Autowired
private MessageFeign messageFeign; private MessageFeign messageFeign;
@Autowired @Autowired
private FlowTaskFeign flowTaskFeign; private FlowTaskFeign flowTaskFeign;
@ -1166,7 +1169,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
if (r == 1) { if (r == 1) {
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId());
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) { if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg()); return rb.setMsg(voResultBean.getMsg());
} }
@ -1241,7 +1244,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
BaseDistributor baseDistributor = this.fetchBySid(businessSid); BaseDistributor baseDistributor = this.fetchBySid(businessSid);
if (bv.getTaskId().equals(baseDistributor.getTaskId())) { if (bv.getTaskId().equals(baseDistributor.getTaskId())) {
bv.setOrgSidPath(baseDistributor.getOrgSidPath()); bv.setOrgSidPath(baseDistributor.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
@ -1364,7 +1367,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
if (r == 1) { if (r == 1) {
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId());
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) { if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg()); return rb.setMsg(voResultBean.getMsg());
} }
@ -1472,7 +1475,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); variables = flowableFeign.getMap(flowProcessMapQuery).getData();
//======================================= //=======================================
bv.setFormVariables(variables); bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) { if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg()); return rb.setMsg(resultBean1.getMsg());
} }

89
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@ -30,6 +30,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basemodelmodprice.*; import com.yxt.anrui.base.api.basemodelmodprice.*;
import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery; import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery;
import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery; import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
@ -40,6 +41,7 @@ import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo; import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService; import com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
@ -47,6 +49,7 @@ import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigMapper;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@ -74,6 +77,7 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -87,6 +91,7 @@ import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -116,6 +121,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
@Autowired @Autowired
private FlowTaskFeign flowTaskFeign; private FlowTaskFeign flowTaskFeign;
@Autowired @Autowired
private FlowFeign flowFeign;
@Autowired
private SysUserFeign sysUserFeign; private SysUserFeign sysUserFeign;
@Autowired @Autowired
private BaseVehmodelConfigMapper baseVehmodelConfigMapper; private BaseVehmodelConfigMapper baseVehmodelConfigMapper;
@ -296,21 +303,35 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.BASEMODELMODPRICE.getProDefId()); bv.setModelId(ProcDefEnum.BASEMODELMODPRICE.getProDefId());
if (r == 1) { if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData(); UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo)); updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送 //==================================添加线程
baseModelModprice = fetchBySid(businessSid); try {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
MessageFlowVo messageFlowVo = new MessageFlowVo(); .setNameFormat("demo-pool-%d").build();
BeanUtil.copyProperties(ufVo, messageFlowVo); ExecutorService pool = new ThreadPoolExecutor(2, 100,
messageFlowableQuery.setUfVo(messageFlowVo); 0L, TimeUnit.MILLISECONDS,
messageFlowableQuery.setAppMap(appMap); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("车型调价申请"); Future future1 = pool.submit(() -> {
messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); //极光推送
messageFlowableQuery.setMsgTitle("车型调价"); BaseModelModprice baseModelModprice2 = fetchBySid(businessSid);
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("车型调价申请");
messageFlowableQuery.setMsgContent(baseModelModprice2.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("车型调价");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
//==================================添加线程
return voResultBean; return voResultBean;
} }
if (r == 2) { if (r == 2) {
@ -373,7 +394,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
variables.put("app", appMap); variables.put("app", appMap);
bv.setFormVariables(variables); bv.setFormVariables(variables);
bv.setOrgSidPath(baseModelModprice.getOrgSidPath()); bv.setOrgSidPath(baseModelModprice.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
@ -398,19 +419,33 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
} else { } else {
//极光推送 //极光推送
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
baseModelModprice = fetchBySid(businessSid); BaseModelModprice baseModelModprice2 = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); //==================================添加线程
MessageFlowVo messageFlowVo = new MessageFlowVo(); try {
BeanUtil.copyProperties(ufVo, messageFlowVo); ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
messageFlowVo.setProcInsId(baseModelModprice.getProcInstId()); .setNameFormat("demo-pool-%d").build();
messageFlowVo.setProcDefId(baseModelModprice.getProcDefId()); ExecutorService pool = new ThreadPoolExecutor(2, 100,
messageFlowableQuery.setUfVo(messageFlowVo); 0L, TimeUnit.MILLISECONDS,
messageFlowableQuery.setAppMap(appMap); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("车型调价申请"); Future future1 = pool.submit(() -> {
messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
messageFlowableQuery.setMsgTitle("车型调价"); MessageFlowVo messageFlowVo = new MessageFlowVo();
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcInsId(baseModelModprice2.getProcInstId());
messageFlowVo.setProcDefId(baseModelModprice2.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("车型调价申请");
messageFlowableQuery.setMsgContent(baseModelModprice2.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("车型调价");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
//==================================添加线程
} }
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} else { } else {

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@ -423,7 +423,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
} }
String purchasingUnitName = baseOutsourcingApplication.getPurchasingUnitName(); String purchasingUnitName = baseOutsourcingApplication.getPurchasingUnitName();
String purchaseSystemName = baseOutsourcingApplication.getPurchaseSystemName(); String purchaseSystemName = baseOutsourcingApplication.getPurchaseSystemName();
String orderNames = purchaseSystemName + purchasingUnitName + "外采申请"; String orderNames = purchaseSystemName + "<" + purchasingUnitName + ">" + "外采申请";
variables.put("orderNames", orderNames); variables.put("orderNames", orderNames);
//=================添加app参数结束 //=================添加app参数结束
bv.setFormVariables(variables); bv.setFormVariables(variables);
@ -500,7 +500,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
BaseOutsourcingApplication entity = fetchBySid(businessSid); BaseOutsourcingApplication entity = fetchBySid(businessSid);
String purchasingUnitName = entity.getPurchasingUnitName(); String purchasingUnitName = entity.getPurchasingUnitName();
String purchaseSystemName = entity.getPurchaseSystemName(); String purchaseSystemName = entity.getPurchaseSystemName();
String orderNames = purchaseSystemName + purchasingUnitName + "外采申请"; String orderNames = purchaseSystemName + "<" + purchasingUnitName + ">" + "外采申请";
variables.put("orderNames", orderNames); variables.put("orderNames", orderNames);
//=================添加app参数结束 //=================添加app参数结束
bv.setFormVariables(variables); bv.setFormVariables(variables);

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/app/AppBusMainDepositOrderVo.java

@ -30,5 +30,6 @@ public class AppBusMainDepositOrderVo implements Vo {
@ApiModelProperty(value = "车型信息") @ApiModelProperty(value = "车型信息")
private List<AppDepositModelListVo> modelList; private List<AppDepositModelListVo> modelList;
private String orgSidPath;
} }

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java

@ -60,7 +60,7 @@ public class BusSalesOrderPriceDetailsVo implements Vo {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private String singleFinalPrice; private String singleFinalPrice;
@ApiModelProperty("单台折让") @ApiModelProperty("单台折让")
private Integer bigDecimalSing; private String bigDecimalSing;
@ApiModelProperty("台数") @ApiModelProperty("台数")
private Integer quantity; private Integer quantity;
@ApiModelProperty("车价合计") @ApiModelProperty("车价合计")

84
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -2529,52 +2529,54 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
//根据合同号和车辆sid查询车辆 //根据合同号和车辆sid查询车辆
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid);
deliveredFinVo.setVinNo(busSalesOrderVehicle.getLinkNo()); if(busSalesOrderVehicle != null){
deliveredFinVo.setPaymentMethod(appOrderDetailsVo.getPayType()); deliveredFinVo.setVinNo(busSalesOrderVehicle.getLinkNo());
deliveredFinVo.setContractNo(contractNo); deliveredFinVo.setPaymentMethod(appOrderDetailsVo.getPayType());
deliveredFinVo.setCustomerName(appOrderDetailsVo.getName()); deliveredFinVo.setContractNo(contractNo);
deliveredFinVo.setModelName(appOrderDetailsVo.getModelInfo().getModelName()); deliveredFinVo.setCustomerName(appOrderDetailsVo.getName());
//根据销售订单车辆查询款项情况 deliveredFinVo.setModelName(appOrderDetailsVo.getModelInfo().getModelName());
ResultBean<ReceiveInvoiceVo> receiveInvoiceVoResultBean = finUncollectedReceivablesDetailedFeign.receivedSelect(busSalesOrderVehicle.getSid(), busSalesOrderVehicle.getLinkSid()); //根据销售订单车辆查询款项情况
if (receiveInvoiceVoResultBean.getData() != null) { ResultBean<ReceiveInvoiceVo> receiveInvoiceVoResultBean = finUncollectedReceivablesDetailedFeign.receivedSelect(busSalesOrderVehicle.getSid(), busSalesOrderVehicle.getLinkSid());
List<ReceiveSeleteVo> receiveSeleteVoList = receiveInvoiceVoResultBean.getData().getReceiveSeleteVoList(); if (receiveInvoiceVoResultBean.getData() != null) {
List<FinSelectVo> voList = Optional.ofNullable(receiveSeleteVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinSelectVo.class)).collect(Collectors.toList()); List<ReceiveSeleteVo> receiveSeleteVoList = receiveInvoiceVoResultBean.getData().getReceiveSeleteVoList();
voList.removeAll(Collections.singleton(null)); List<FinSelectVo> voList = Optional.ofNullable(receiveSeleteVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinSelectVo.class)).collect(Collectors.toList());
List<FinSelectVo> finSelectVos = new ArrayList<>(); voList.removeAll(Collections.singleton(null));
if (!voList.isEmpty()) { List<FinSelectVo> finSelectVos = new ArrayList<>();
for (FinSelectVo finSelectVo : voList) { if (!voList.isEmpty()) {
String receivablesSid = finSelectVo.getReceivablesSid(); for (FinSelectVo finSelectVo : voList) {
FinSelectedReceivablesDetailed data = finSelectedReceivablesDetailedFeign.fetchByReceivablesSidLimt(receivablesSid).getData(); String receivablesSid = finSelectVo.getReceivablesSid();
if (data != null) { FinSelectedReceivablesDetailed data = finSelectedReceivablesDetailedFeign.fetchByReceivablesSidLimt(receivablesSid).getData();
String collSid = data.getCollSid(); if (data != null) {
if (StringUtils.isNotBlank(data.getSubscriptionDate())) { String collSid = data.getCollSid();
finSelectVo.setSubscriptionDate(data.getSubscriptionDate()); if (StringUtils.isNotBlank(data.getSubscriptionDate())) {
} finSelectVo.setSubscriptionDate(data.getSubscriptionDate());
FinCollectionConfirmationDetailsVo confirmationDetailsVo = finCollectionConfirmationFeign.fetchBySid(collSid).getData();
if (null != confirmationDetailsVo) {
if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionBank())) {
finSelectVo.setCollectionBank(confirmationDetailsVo.getCollectionBank());
}
if (StringUtils.isNotBlank(confirmationDetailsVo.getReceivingName())) {
finSelectVo.setReceivingName(confirmationDetailsVo.getReceivingName());
} }
if (StringUtils.isNotBlank(confirmationDetailsVo.getPayerName())) { FinCollectionConfirmationDetailsVo confirmationDetailsVo = finCollectionConfirmationFeign.fetchBySid(collSid).getData();
finSelectVo.setPayerName(confirmationDetailsVo.getPayerName()); if (null != confirmationDetailsVo) {
} if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionBank())) {
if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionDate())) { finSelectVo.setCollectionBank(confirmationDetailsVo.getCollectionBank());
finSelectVo.setCollectionDate(confirmationDetailsVo.getCollectionDate()); }
if (StringUtils.isNotBlank(confirmationDetailsVo.getReceivingName())) {
finSelectVo.setReceivingName(confirmationDetailsVo.getReceivingName());
}
if (StringUtils.isNotBlank(confirmationDetailsVo.getPayerName())) {
finSelectVo.setPayerName(confirmationDetailsVo.getPayerName());
}
if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionDate())) {
finSelectVo.setCollectionDate(confirmationDetailsVo.getCollectionDate());
}
} }
} }
finSelectVos.add(finSelectVo);
} }
finSelectVos.add(finSelectVo);
} }
} deliveredFinVo.setFinSelectVoList(finSelectVos);
deliveredFinVo.setFinSelectVoList(finSelectVos); InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo();
InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo(); if (invoiceVo != null) {
if (invoiceVo != null) { VinInvoiceVo vinInvoiceVo = new VinInvoiceVo();
VinInvoiceVo vinInvoiceVo = new VinInvoiceVo(); BeanUtil.copyProperties(invoiceVo, vinInvoiceVo);
BeanUtil.copyProperties(invoiceVo, vinInvoiceVo); deliveredFinVo.setVinInvoiceVo(vinInvoiceVo);
deliveredFinVo.setVinInvoiceVo(vinInvoiceVo); }
} }
} }
return rb.success().setData(deliveredFinVo); return rb.success().setData(deliveredFinVo);

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@ -58,6 +58,7 @@ import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@ -120,6 +121,8 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired @Autowired
private FlowFeign flowFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign; private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired @Autowired
private BusHandoverItemsService busHandoverItemsService; private BusHandoverItemsService busHandoverItemsService;
@ -1968,7 +1971,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
if (r == 1) { if (r == 1) {
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.BUSHANDOVER.getProDefId()); bv.setModelId(ProcDefEnum.BUSHANDOVER.getProDefId());
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) { if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg()); return rb.setMsg(voResultBean.getMsg());
} }
@ -2068,7 +2071,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
BusHandover busHandover = this.fetchBySid(businessSid); BusHandover busHandover = this.fetchBySid(businessSid);
if (bv.getTaskId().equals(busHandover.getTaskId())) { if (bv.getTaskId().equals(busHandover.getTaskId())) {
bv.setOrgSidPath(busHandover.getOrgSidPath()); bv.setOrgSidPath(busHandover.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@ -333,7 +333,7 @@
bd.billNo as virtualId, bd.billNo as virtualId,
bc.customerName, bc.customerName,
bc.customerMobile as mobile, bc.customerMobile as mobile,
bd.staffSid bd.staffSid,bd.orgSidPath
from bus_main_deposit bd from bus_main_deposit bd
left join bus_deposit_vehicle_customer bc on bd.sid = bc.billSid left join bus_deposit_vehicle_customer bc on bd.sid = bc.billSid
<where> <where>

17
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@ -675,6 +675,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
record.setPaymentState("待确认"); record.setPaymentState("待确认");
} }
} }
if(!"0".equals(useDepositMoney)){
record.setShowDepositBtn(true);
}
} }
record.setCarNumber(vo.getCarNumber()); record.setCarNumber(vo.getCarNumber());
} else if (record.getVirtualOrderType().equals("02")) { } else if (record.getVirtualOrderType().equals("02")) {
@ -695,12 +698,12 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
record.setShowDeleteBtn(false); record.setShowDeleteBtn(false);
record.setShowUpdateBtn(false); record.setShowUpdateBtn(false);
} }
List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderSid()); /* List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderSid());
if (depositRecords.size() > 0) { if (depositRecords.size() > 0) {
record.setShowDepositBtn(true); record.setShowDepositBtn(true);
} else { } else {
record.setShowDepositBtn(false); record.setShowDepositBtn(false);
} }*/
if ("收款确认".equals(record.getVirtualOrderState())) { if ("收款确认".equals(record.getVirtualOrderState())) {
record.setShowApplyBtn(true); record.setShowApplyBtn(true);
} else { } else {
@ -1114,7 +1117,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
for (AppDepositModelListVo v : voList) { for (AppDepositModelListVo v : voList) {
String modelSid = v.getModelSid(); String modelSid = v.getModelSid();
String configSid = v.getConfigSid(); String configSid = v.getConfigSid();
String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(vo.getStaffSid()).getData(); String orgSid = sysStaffOrgFeign.getOrgSidByPath(vo.getOrgSidPath()).getData();
// String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(vo.getStaffSid()).getData();
//根据车型sid及配置sid查询单台指导价 //根据车型sid及配置sid查询单台指导价
ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(modelSid, configSid, orgSid); ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(modelSid, configSid, orgSid);
if (voResultBean.getSuccess()) { if (voResultBean.getSuccess()) {
@ -1387,12 +1391,13 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
return rb.setMsg("当前所在的组织机构不存在"); return rb.setMsg("当前所在的组织机构不存在");
} }
if (StringUtils.isBlank(sysOrganization.getManagerSid())) { if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
return rb.setMsg("当前所在的组织机构未设置主管人员"); // return rb.setMsg("当前所在的组织机构未设置主管人员");
sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
} }
String nextNodeUserSids_ = sysOrganization.getManagerSid(); String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_); bv.setNextNodeUserSids(nextNodeUserSids_);
if (r == 1) { if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData(); UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo)); updateFlowFiled(BeanUtil.beanToMap(ufVo));
if ("Event_end".equals(ufVo.getTaskDefKey())) { if ("Event_end".equals(ufVo.getTaskDefKey())) {
@ -1468,7 +1473,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
bv.setFormVariables(variables); bv.setFormVariables(variables);
bv.setOrgSidPath(busMainDeposit.getOrgSidPath()); bv.setOrgSidPath(busMainDeposit.getOrgSidPath());
if (bv.getTaskId().equals(busMainDeposit.getTaskId())) { if (bv.getTaskId().equals(busMainDeposit.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
log.info("流程返回:{}", JSONObject.toJSONString(resultBean)); log.info("流程返回:{}", JSONObject.toJSONString(resultBean));
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());

105
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -468,7 +468,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (busSalesOrderModelDetailsVo != null) { if (busSalesOrderModelDetailsVo != null) {
//查询现车车辆 //查询现车车辆
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) { if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
if(StringUtils.isNotBlank(entity.getNowCarUnknownVinNum())){ if(StringUtils.isNotBlank(entity.getNowCarUnknownVinNum()) && !"0".equals(entity.getNowCarUnknownVinNum())){
List<String> vinList = new ArrayList<>(); List<String> vinList = new ArrayList<>();
vinList.add("不确定车架号("+entity.getNowCarUnknownVinNum()+")"); vinList.add("不确定车架号("+entity.getNowCarUnknownVinNum()+")");
busSalesOrderModelDetailsVo.setVinNo(vinList); busSalesOrderModelDetailsVo.setVinNo(vinList);
@ -523,52 +523,55 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} }
String topMessage = ""; String topMessage = "";
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid); BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
//颜色 if(busSalesOrderMakeup != null){
if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) { //颜色
topMessage = topMessage + busSalesOrderMakeup.getColor(); if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
} topMessage = topMessage + busSalesOrderMakeup.getColor();
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())) {
topMessage = topMessage + busSalesOrderMakeup.getTopName();
}
//板材厚度
String ssMessage = "";
if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessBottom())) {
ssMessage = "底" + busSalesOrderMakeup.getThicknessBottom() + "mm";
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessEdge())) {
ssMessage = ssMessage + "边" + busSalesOrderMakeup.getThicknessEdge() + "mm";
}
if (StringUtils.isNotBlank(ssMessage)) {
topMessage = topMessage + "、" + ssMessage;
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getPlateMaterial())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getPlateMaterial();
}
//篷布滑道
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTarpaulinSlide()) && !"-".equals(busSalesOrderMakeup.getTarpaulinSlide())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getTarpaulinSlide();
}
//冷藏冷机
if (StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator();
if (!busSalesOrderMakeup.getRefirgerator().contains("机")) {
topMessage = topMessage + "冷机";
} }
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())) {
topMessage = topMessage + busSalesOrderMakeup.getTopName();
}
//板材厚度
String ssMessage = "";
if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessBottom())) {
ssMessage = "底" + busSalesOrderMakeup.getThicknessBottom() + "mm";
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessEdge())) {
ssMessage = ssMessage + "边" + busSalesOrderMakeup.getThicknessEdge() + "mm";
}
if (StringUtils.isNotBlank(ssMessage)) {
topMessage = topMessage + "、" + ssMessage;
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getPlateMaterial())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getPlateMaterial();
}
//篷布滑道
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTarpaulinSlide()) && !"-".equals(busSalesOrderMakeup.getTarpaulinSlide())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getTarpaulinSlide();
}
//冷藏冷机
if (StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator();
if (!busSalesOrderMakeup.getRefirgerator().contains("机")) {
topMessage = topMessage + "冷机";
}
}
//自卸液压盖板
if (StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl()) && !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getSelfUnHyCoPl();
}
//底板加热
if (StringUtils.isNotBlank(busSalesOrderMakeup.getFloorHeating()) && !"-".equals(busSalesOrderMakeup.getFloorHeating())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getFloorHeating();
}
//更多配置
if (StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig()) && !"-".equals(busSalesOrderMakeup.getMoreConfig())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getMoreConfig();
}
busSalesOrderMakeupDetailsVo.setTopMessage(topMessage);
vo.setBusSalesOrderMakeup(busSalesOrderMakeupDetailsVo);
} }
//自卸液压盖板
if (StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl()) && !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getSelfUnHyCoPl();
}
//底板加热
if (StringUtils.isNotBlank(busSalesOrderMakeup.getFloorHeating()) && !"-".equals(busSalesOrderMakeup.getFloorHeating())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getFloorHeating();
}
//更多配置
if (StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig()) && !"-".equals(busSalesOrderMakeup.getMoreConfig())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getMoreConfig();
}
busSalesOrderMakeupDetailsVo.setTopMessage(topMessage);
vo.setBusSalesOrderMakeup(busSalesOrderMakeupDetailsVo);
} }
/*************************************************优惠明细*****************************************************/ /*************************************************优惠明细*****************************************************/
List<BusSalesOrderDiscountDetailsVo> busSalesOrderDiscountDetailsVoList = busSalesOrderDiscountService.detailsList(entity.getSid()); List<BusSalesOrderDiscountDetailsVo> busSalesOrderDiscountDetailsVoList = busSalesOrderDiscountService.detailsList(entity.getSid());
@ -597,7 +600,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} }
if (StringUtils.isNotBlank(totalValue.toString())) { if (StringUtils.isNotBlank(totalValue.toString())) {
if (busSalesOrderPriceDetailsVo != null) { if (busSalesOrderPriceDetailsVo != null) {
BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()), BigDecimal.ROUND_CEILING); BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()),2, BigDecimal.ROUND_CEILING);
bigDecimalSing = bigDecimalSing.add(discountA); bigDecimalSing = bigDecimalSing.add(discountA);
} }
} }
@ -613,7 +616,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
bigDecimalSing = bigDecimalSing.add(agen); bigDecimalSing = bigDecimalSing.add(agen);
} }
if (busSalesOrderPriceDetailsVo != null) { if (busSalesOrderPriceDetailsVo != null) {
busSalesOrderPriceDetailsVo.setBigDecimalSing(Integer.parseInt(bigDecimalSing.toString())); busSalesOrderPriceDetailsVo.setBigDecimalSing(bigDecimalSing.toString());
} }
vo.setBusSalesOrderPrice(busSalesOrderPriceDetailsVo); vo.setBusSalesOrderPrice(busSalesOrderPriceDetailsVo);
/***************************保险信息***************************************/ /***************************保险信息***************************************/
@ -1323,7 +1326,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<String> initBigDecimalOneList = new ArrayList<>(); List<String> initBigDecimalOneList = new ArrayList<>();
//是否是现车//ToDo:促销政策 //是否是现车//ToDo:促销政策
if ("1".equals(busSalesOrder.getType())) { if ("1".equals(busSalesOrder.getType())) {
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) { if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
//根据销售订单sid查询现车的sid集合 //根据销售订单sid查询现车的sid集合
vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid); vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
//根据现车去查询销售政策的总促销政策之和 //根据现车去查询销售政策的总促销政策之和
@ -2418,7 +2421,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//查询是否有车辆信息:1现车、2采购订单、3排产。需要对应apifox中对应的类型:0现车、1采购订单、2排产 //查询是否有车辆信息:1现车、2采购订单、3排产。需要对应apifox中对应的类型:0现车、1采购订单、2排产
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())) { if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())) {
if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())) { if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
orderInfo.setNowCarUnknownVinNum(busSalesOrder.getNowCarUnknownVinNum()); orderInfo.setNowCarUnknownVinNum(busSalesOrder.getNowCarUnknownVinNum());
} else { } else {
//类型为现车,查询该销售订单的现车车辆信息 //类型为现车,查询该销售订单的现车车辆信息
@ -3416,7 +3419,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//若前端传值的订单类型为0则为现车,为1采购订单,为2排产 //若前端传值的订单类型为0则为现车,为1采购订单,为2排产
//数据库中1为现车,2为采购订单,3为排产 //数据库中1为现车,2为采购订单,3为排产
if ("0".equals(modelInfo.getType())) { if ("0".equals(modelInfo.getType())) {
if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())){ if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())){
List<String> vinList = new ArrayList<>(); List<String> vinList = new ArrayList<>();
vinList.add("不确定车架号("+busSalesOrder.getNowCarUnknownVinNum()+")"); vinList.add("不确定车架号("+busSalesOrder.getNowCarUnknownVinNum()+")");
modelInfo.setVinList(vinList); modelInfo.setVinList(vinList);
@ -5177,7 +5180,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(bv.getBusinessSid()); ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(bv.getBusinessSid());
AppOrderDetailsVo vo = details.getData(); AppOrderDetailsVo vo = details.getData();
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) { if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) { if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
//更新已选择的车架号的状态为销售订单锁定 //更新已选择的车架号的状态为销售订单锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid()); List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid());
list.removeAll(Collections.singleton(null)); list.removeAll(Collections.singleton(null));

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@ -235,7 +235,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
} }
//现车下不确定车架号的车辆数量 //现车下不确定车架号的车辆数量
String nowCarUnknownVinNum = orderInfo.getNowCarUnknownVinNum(); String nowCarUnknownVinNum = orderInfo.getNowCarUnknownVinNum();
if(StringUtils.isBlank(nowCarUnknownVinNum)){ if(StringUtils.isBlank(nowCarUnknownVinNum) || "0".equals(nowCarUnknownVinNum)){
//添加上装信息=========== //添加上装信息===========
ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid()); ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid());
if (details.getData() != null) { if (details.getData() != null) {
@ -685,7 +685,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
int num = 0; int num = 0;
if ("0".equals(state)) {//现车 if ("0".equals(state)) {//现车
type = "1"; type = "1";
if(StringUtils.isNotBlank(nowCarUnknownVinNum)){//不确定车架号 if(StringUtils.isNotBlank(nowCarUnknownVinNum) && !"0".equals(nowCarUnknownVinNum)){//不确定车架号
num = Integer.valueOf(nowCarUnknownVinNum).intValue(); num = Integer.valueOf(nowCarUnknownVinNum).intValue();
busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid); busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid);
busSalesOrder.setNowCarUnknownVinNum(nowCarUnknownVinNum); busSalesOrder.setNowCarUnknownVinNum(nowCarUnknownVinNum);
@ -766,7 +766,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum); busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum);
} }
if ("3".equals(type) || "2".equals(type) || StringUtils.isNotBlank(nowCarUnknownVinNum)) { if ("3".equals(type) || "2".equals(type) || (StringUtils.isNotBlank(nowCarUnknownVinNum) && !"0".equals(nowCarUnknownVinNum))) {
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle(); BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
busSalesOrderVehicle.setSalesOrderSid(salesOrderSid); busSalesOrderVehicle.setSalesOrderSid(salesOrderSid);

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@ -68,6 +68,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@ -134,6 +135,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
private SysUserFeign sysUserFeign; private SysUserFeign sysUserFeign;
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired
private FlowFeign flowFeign;
@Resource @Resource
private SysStaffOrgFeign sysStaffOrgFeign; private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired @Autowired
@ -439,7 +442,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
return rb.setMsg("当前所在的组织机构不存在"); return rb.setMsg("当前所在的组织机构不存在");
} }
if (StringUtils.isBlank(sysOrganization.getManagerSid())) { if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
return rb.setMsg("当前所在的组织机构未设置主管人员"); // return rb.setMsg("当前所在的组织机构未设置主管人员");
sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
} }
BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(dto.getSid()); BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, busSalesOrderReturnVehApply); int r = submitBusinessData(dto, busSalesOrderReturnVehApply);
@ -478,7 +482,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
String nextNodeUserSids_ = sysOrganization.getManagerSid(); String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_); bv.setNextNodeUserSids(nextNodeUserSids_);
if (r == 1) { if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) { if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg()); return rb.setMsg(voResultBean.getMsg());
} }
@ -563,7 +567,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
bv.setFormVariables(variables); bv.setFormVariables(variables);
bv.setOrgSidPath(busSalesOrderReturnVehApply.getOrgSidPath()); bv.setOrgSidPath(busSalesOrderReturnVehApply.getOrgSidPath());
if (bv.getTaskId().equals(busSalesOrderReturnVehApply.getTaskId())) { if (bv.getTaskId().equals(busSalesOrderReturnVehApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }

4
anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-pro.yml

@ -4,6 +4,10 @@ spring:
url: jdbc:mysql://120.46.172.184:3306/anrui_buscenter?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://120.46.172.184:3306/anrui_buscenter?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8
username: root username: root
password: '@anrui18033887500' password: '@anrui18033887500'
hikari:
minimum-idle: 3
max-lifetime: 30000
maximum-pool-size: 10
cloud: cloud:
nacos: nacos:
discovery: discovery:

4
anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml

@ -4,6 +4,10 @@ spring:
url: jdbc:mysql://39.104.100.138:3306/anrui_buscenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true url: jdbc:mysql://39.104.100.138:3306/anrui_buscenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
username: root username: root
password: yxt_mysql_138 password: yxt_mysql_138
hikari:
minimum-idle: 3
max-lifetime: 30000
maximum-pool-size: 10
cloud: cloud:
nacos: nacos:
discovery: discovery:

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -368,10 +368,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto = dingList.get(i); FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto = dingList.get(i);
BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getCurrentReceivableMoney()); BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getCurrentReceivableMoney());
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getSubscriptionMoney()); BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getSubscriptionMoney());
if (subscriptionMoney.compareTo(currentReceivableMoney) > 0) { if(finSelectedReceivablesDetailedDto.getSubscribedOf() == 0){
return rb.setMsg("订金不允许多收,请检查"); if (subscriptionMoney.compareTo(currentReceivableMoney) > 0) {
return rb.setMsg("应收未收中的订金不允许多收,请检查");
}
} }
} }
} }
return rb.success(); return rb.success();

164
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@ -29,9 +29,11 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
import com.yxt.anrui.fin.api.fincostapply.*; import com.yxt.anrui.fin.api.fincostapply.*;
import com.yxt.anrui.fin.api.fincostapply.flow.FinCostGetNodeQuery; import com.yxt.anrui.fin.api.fincostapply.flow.FinCostGetNodeQuery;
import com.yxt.anrui.fin.api.fincostapply.flow.FinCostGetNodeVo; import com.yxt.anrui.fin.api.fincostapply.flow.FinCostGetNodeVo;
@ -41,6 +43,7 @@ import com.yxt.anrui.fin.api.fincostapplyvehicle.FinCostapplyVehicle;
import com.yxt.anrui.fin.biz.fincostapplyvehicle.FinCostapplyVehicleService; import com.yxt.anrui.fin.biz.fincostapplyvehicle.FinCostapplyVehicleService;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@ -63,11 +66,13 @@ import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery; import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -93,6 +98,8 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired @Autowired
private FlowFeign flowFeign;
@Autowired
private FlowTaskFeign flowTaskFeign; private FlowTaskFeign flowTaskFeign;
@Autowired @Autowired
private FinCostapplyVehicleService finCostapplyVehicleService; private FinCostapplyVehicleService finCostapplyVehicleService;
@ -134,8 +141,8 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
qw.eq("fc.createBySid", pageQuery.getUserSid()); qw.eq("fc.createBySid", pageQuery.getUserSid());
} }
//申请人的组织机构sid全路径 //申请人的组织机构sid全路径
if(StringUtils.isNotBlank(pageQuery.getOrgPath())){ if (StringUtils.isNotBlank(pageQuery.getOrgPath())) {
qw.eq("fc.orgSidPath",pageQuery.getOrgPath()); qw.eq("fc.orgSidPath", pageQuery.getOrgPath());
} }
} }
IPage<FinCostapply> page = PagerUtil.queryToPage(pq); IPage<FinCostapply> page = PagerUtil.queryToPage(pq);
@ -150,12 +157,12 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
//======================================= //=======================================
String orgSidPath = ""; String orgSidPath = "";
if(StringUtils.isNotBlank(dto.getOrgPath())){ if (StringUtils.isNotBlank(dto.getOrgPath())) {
orgSidPath = dto.getOrgPath(); orgSidPath = dto.getOrgPath();
}else{ } else {
orgSidPath = dto.getOrgSidPath(); orgSidPath = dto.getOrgSidPath();
} }
if(StringUtils.isBlank(orgSidPath)){ if (StringUtils.isBlank(orgSidPath)) {
//根据用户sid获取staffSid //根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) { if (!userVoResultBean.getSuccess()) {
@ -200,7 +207,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
if (finCostapply == null) { if (finCostapply == null) {
return rb.setMsg("该费用申请不存在"); return rb.setMsg("该费用申请不存在");
} }
BeanUtil.copyProperties(dto, finCostapply,"orgSidPath"); BeanUtil.copyProperties(dto, finCostapply, "orgSidPath");
finCostapplyVehicleService.deleteByMainSid(dtoSid); finCostapplyVehicleService.deleteByMainSid(dtoSid);
if (finCostapply.getIsVeh() == 1) { if (finCostapply.getIsVeh() == 1) {
if (finCostapply.getIsOutDoor() == null) { if (finCostapply.getIsOutDoor() == null) {
@ -274,9 +281,9 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
//用户的组织全路径 //用户的组织全路径
String orgSidPath = ""; String orgSidPath = "";
String orgPath = dto.getOrgPath(); String orgPath = dto.getOrgPath();
if(StringUtils.isNotBlank(orgPath)){ if (StringUtils.isNotBlank(orgPath)) {
orgSidPath = orgPath; orgSidPath = orgPath;
}else{ } else {
orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
} }
FinCostapply finCostapply = fetchBySid(dto.getSid()); FinCostapply finCostapply = fetchBySid(dto.getSid());
@ -334,34 +341,46 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
String nextNodeUserSids_ = nextNodeUserSids.toString(); String nextNodeUserSids_ = nextNodeUserSids.toString();
bv.setNextNodeUserSids(nextNodeUserSids_);*/ bv.setNextNodeUserSids(nextNodeUserSids_);*/
List<String> orgPathList = Arrays.asList(orgSidPath.split("/")); List<String> orgPathList = Arrays.asList(orgSidPath.split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size()-1)).getData(); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
if(sysOrganization == null){ if (sysOrganization == null) {
return rb.setMsg("当前所在的组织机构不存在"); return rb.setMsg("当前所在的组织机构不存在");
} }
if(StringUtils.isBlank(sysOrganization.getManagerSid())){ if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
return rb.setMsg("当前所在的组织机构未设置主管人员"); // return rb.setMsg("当前所在的组织机构未设置主管人员");
sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
} }
String nextNodeUserSids_ = sysOrganization.getManagerSid(); String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_); bv.setNextNodeUserSids(nextNodeUserSids_);
if (r == 1) { if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) { if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg()); return rb.setMsg(voResultBean.getMsg());
} }
UpdateFlowFieldVo ufVo = voResultBean.getData(); UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo)); updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送 try {
finCostapply = fetchBySid(businessSid); ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); .setNameFormat("demo-pool-%d").build();
MessageFlowVo messageFlowVo = new MessageFlowVo(); ExecutorService pool = new ThreadPoolExecutor(2, 100,
BeanUtil.copyProperties(ufVo, messageFlowVo); 0L, TimeUnit.MILLISECONDS,
messageFlowableQuery.setUfVo(messageFlowVo); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
messageFlowableQuery.setAppMap(appMap); FinCostapply finCostapply2 = fetchBySid(businessSid);
messageFlowableQuery.setBusinessSid(businessSid); Future future1 = pool.submit(() -> {
messageFlowableQuery.setModuleName("费用申请"); //极光推送
messageFlowableQuery.setMsgContent(finCostapply.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
messageFlowableQuery.setMsgTitle("费用申请"); MessageFlowVo messageFlowVo = new MessageFlowVo();
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("费用申请");
messageFlowableQuery.setMsgContent(finCostapply2.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("费用申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return voResultBean; return voResultBean;
} }
if (r == 2) { if (r == 2) {
@ -433,27 +452,39 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
vaributes.put("app", appMap); vaributes.put("app", appMap);
bv.setFormVariables(vaributes); bv.setFormVariables(vaributes);
bv.setOrgSidPath(finCostapply.getOrgSidPath()); bv.setOrgSidPath(finCostapply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if (!"Event_end".equals(resultBean.getData().getTaskDefKey())){ if (!"Event_end".equals(resultBean.getData().getTaskDefKey())) {
//极光推送 //极光推送
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
finCostapply = fetchBySid(bv.getBusinessSid()); try {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
MessageFlowVo messageFlowVo = new MessageFlowVo(); .setNameFormat("demo-pool-%d").build();
BeanUtil.copyProperties(ufVo, messageFlowVo); ExecutorService pool = new ThreadPoolExecutor(2, 100,
ufVo.setProcDefId(finCostapply.getProcDefId()); 0L, TimeUnit.MILLISECONDS,
ufVo.setProcInsId(finCostapply.getProcInstId()); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
messageFlowableQuery.setUfVo(messageFlowVo); FinCostapply finCostapply2 = fetchBySid(bv.getBusinessSid());
messageFlowableQuery.setAppMap(appMap); Future future1 = pool.submit(() -> {
messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); //极光推送
messageFlowableQuery.setModuleName("费用申请"); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
messageFlowableQuery.setMsgContent(finCostapply.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); MessageFlowVo messageFlowVo = new MessageFlowVo();
messageFlowableQuery.setMsgTitle("费用申请"); BeanUtil.copyProperties(ufVo, messageFlowVo);
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); ufVo.setProcDefId(finCostapply2.getProcDefId());
ufVo.setProcInsId(finCostapply2.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("费用申请");
messageFlowableQuery.setMsgContent(finCostapply2.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("费用申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
} }
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} else { } else {
@ -533,28 +564,39 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
updateFlowFiled(map); updateFlowFiled(map);
//极光推送 //极光推送
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
finCostapply = fetchBySid(businessSid); try {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
MessageFlowVo messageFlowVo = new MessageFlowVo(); .setNameFormat("demo-pool-%d").build();
BeanUtil.copyProperties(ufVo, messageFlowVo); ExecutorService pool = new ThreadPoolExecutor(2, 100,
String procId = finCostapply.getProcInstId(); 0L, TimeUnit.MILLISECONDS,
ufVo.setProcInsId(procId); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
ufVo.setProcDefId(finCostapply.getProcDefId()); FinCostapply finCostapply2 = fetchBySid(businessSid);
messageFlowableQuery.setUfVo(messageFlowVo); Future future1 = pool.submit(() -> {
messageFlowableQuery.setAppMap(appMap); //极光推送
messageFlowableQuery.setBusinessSid(businessSid); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
messageFlowableQuery.setModuleName("费用申请"); MessageFlowVo messageFlowVo = new MessageFlowVo();
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId); BeanUtil.copyProperties(ufVo, messageFlowVo);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); String procId = finCostapply2.getProcInstId();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); ufVo.setProcInsId(procId);
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(finCostapply.getCreateBySid())) { ufVo.setProcDefId(finCostapply2.getProcDefId());
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); messageFlowableQuery.setUfVo(messageFlowVo);
} else { messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setMsgContent(finCostapply.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("费用申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(finCostapply2.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(finCostapply2.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("费用申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
} }
messageFlowableQuery.setMsgTitle("费用申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success(); return rb.success();
} }
} }

156
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@ -30,11 +30,13 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
import com.yxt.anrui.fin.api.finpaymentapply.*; import com.yxt.anrui.fin.api.finpaymentapply.*;
import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeQuery; import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeQuery;
import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeVo; import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeVo;
@ -52,6 +54,7 @@ import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleServic
import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService; import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@ -76,11 +79,13 @@ import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery; import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -106,6 +111,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired @Autowired
private FlowFeign flowFeign;
@Autowired
private FlowTaskFeign flowTaskFeign; private FlowTaskFeign flowTaskFeign;
@Autowired @Autowired
private SysOrganizationFeign sysOrganizationFeign; private SysOrganizationFeign sysOrganizationFeign;
@ -154,7 +161,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
if (StringUtils.isNotBlank(pageQuery.getUserSid())) { if (StringUtils.isNotBlank(pageQuery.getUserSid())) {
qw.eq("fp.createBySid", pageQuery.getUserSid()); qw.eq("fp.createBySid", pageQuery.getUserSid());
} }
if(StringUtils.isNotBlank(pageQuery.getOrgPath())){ if (StringUtils.isNotBlank(pageQuery.getOrgPath())) {
String orgSid = sysStaffOrgFeign.getOrgSidByPath(pageQuery.getOrgPath()).getData(); String orgSid = sysStaffOrgFeign.getOrgSidByPath(pageQuery.getOrgPath()).getData();
qw.eq("fp.createBySid", orgSid); qw.eq("fp.createBySid", orgSid);
} }
@ -174,9 +181,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
//======================================= //=======================================
String orgSidPath = ""; String orgSidPath = "";
if(StringUtils.isNotBlank(dto.getOrgPath())){ if (StringUtils.isNotBlank(dto.getOrgPath())) {
orgSidPath = dto.getOrgPath(); orgSidPath = dto.getOrgPath();
}else{ } else {
orgSidPath = dto.getOrgSidPath(); orgSidPath = dto.getOrgSidPath();
} }
if (StringUtils.isBlank(orgSidPath)) { if (StringUtils.isBlank(orgSidPath)) {
@ -288,10 +295,10 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
if (!userVoResultBean.getSuccess()) { if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg()); return rb.setMsg(userVoResultBean.getMsg());
} }
if(StringUtils.isNotBlank(dto.getOrgPath())){ if (StringUtils.isNotBlank(dto.getOrgPath())) {
orgSidPath = dto.getOrgSidPath(); orgSidPath = dto.getOrgSidPath();
}else{ } else {
//根据staffSid获取用户的组织全路径 //根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) { if (!staffOrgResultBean.getSuccess()) {
@ -353,34 +360,46 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
//符合条件的用户的sid,拼接的字符串 //符合条件的用户的sid,拼接的字符串
String nextNodeUserSids_ = nextNodeUserSids.toString();*/ String nextNodeUserSids_ = nextNodeUserSids.toString();*/
List<String> orgPathList = Arrays.asList(orgSidPath.split("/")); List<String> orgPathList = Arrays.asList(orgSidPath.split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size()-1)).getData(); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
if(sysOrganization == null){ if (sysOrganization == null) {
return rb.setMsg("当前所在的组织机构不存在"); return rb.setMsg("当前所在的组织机构不存在");
} }
if(StringUtils.isBlank(sysOrganization.getManagerSid())){ if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
return rb.setMsg("当前所在的组织机构未设置主管人员"); //return rb.setMsg("当前所在的组织机构未设置主管人员");
sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
} }
String nextNodeUserSids_ = sysOrganization.getManagerSid(); String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_); bv.setNextNodeUserSids(nextNodeUserSids_);
if (r == 1) { if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) { if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg()); return rb.setMsg(voResultBean.getMsg());
} }
UpdateFlowFieldVo ufVo = voResultBean.getData(); UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo)); updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送 try {
finPaymentapply = fetchBySid(businessSid); ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); .setNameFormat("demo-pool-%d").build();
MessageFlowVo messageFlowVo = new MessageFlowVo(); ExecutorService pool = new ThreadPoolExecutor(2, 100,
BeanUtil.copyProperties(ufVo, messageFlowVo); 0L, TimeUnit.MILLISECONDS,
messageFlowableQuery.setUfVo(messageFlowVo); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
messageFlowableQuery.setAppMap(appMap); FinPaymentapply finPaymentapply2 = fetchBySid(businessSid);
messageFlowableQuery.setBusinessSid(businessSid); Future future1 = pool.submit(() -> {
messageFlowableQuery.setModuleName("付款申请"); //极光推送
messageFlowableQuery.setMsgContent(finPaymentapply.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
messageFlowableQuery.setMsgTitle("付款申请"); MessageFlowVo messageFlowVo = new MessageFlowVo();
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("付款申请");
messageFlowableQuery.setMsgContent(finPaymentapply2.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("付款申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return voResultBean; return voResultBean;
} }
if (r == 2) { if (r == 2) {
@ -451,7 +470,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
vaributes.put("app", appMap); vaributes.put("app", appMap);
bv.setFormVariables(vaributes); bv.setFormVariables(vaributes);
bv.setOrgSidPath(finPaymentapply.getOrgSidPath()); bv.setOrgSidPath(finPaymentapply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
@ -536,19 +555,31 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
} else { } else {
//极光推送 //极光推送
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
finPaymentapply = fetchBySid(bv.getBusinessSid()); try {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
MessageFlowVo messageFlowVo = new MessageFlowVo(); .setNameFormat("demo-pool-%d").build();
BeanUtil.copyProperties(ufVo, messageFlowVo); ExecutorService pool = new ThreadPoolExecutor(2, 100,
ufVo.setProcDefId(finPaymentapply.getProcDefId()); 0L, TimeUnit.MILLISECONDS,
ufVo.setProcInsId(finPaymentapply.getProcInstId()); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
messageFlowableQuery.setUfVo(messageFlowVo); FinPaymentapply finPaymentapply2 = fetchBySid(bv.getBusinessSid());
messageFlowableQuery.setAppMap(appMap); Future future1 = pool.submit(() -> {
messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); //极光推送
messageFlowableQuery.setModuleName("付款申请"); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
messageFlowableQuery.setMsgContent(finPaymentapply.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); MessageFlowVo messageFlowVo = new MessageFlowVo();
messageFlowableQuery.setMsgTitle("付款申请"); BeanUtil.copyProperties(ufVo, messageFlowVo);
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); ufVo.setProcDefId(finPaymentapply2.getProcDefId());
ufVo.setProcInsId(finPaymentapply2.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("付款申请");
messageFlowableQuery.setMsgContent(finPaymentapply2.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("付款申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
} }
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} else { } else {
@ -628,28 +659,39 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
updateFlowFiled(map); updateFlowFiled(map);
//极光推送 //极光推送
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
finPaymentapply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = finPaymentapply.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(finPaymentapply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("付款申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(finPaymentapply.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(finPaymentapply.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("付款申请"); try {
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); 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());
FinPaymentapply finPaymentapply2 = fetchBySid(businessSid);
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = finPaymentapply2.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(finPaymentapply2.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("付款申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(finPaymentapply2.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(finPaymentapply2.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("付款申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success(); return rb.success();
} }
} }

7
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -14,20 +14,15 @@ public enum ProcDefEnum {
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"), SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
//FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:3:2430004"), FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:3:2430004"),
//QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
//QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:3:1592508"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"), QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"),
//QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"),
QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:4:1865016"), ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:4:1865016"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"),
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"),
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"), FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"), FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
//RECORDAPPLICATION("入库申请", "process_xbwq2c7p:4:1232504"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"), RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"), SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),

9
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java

@ -8,6 +8,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@ -69,6 +70,8 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired @Autowired
private FlowFeign flowFeign;
@Autowired
private MessageFeign messageFeign; private MessageFeign messageFeign;
@Autowired @Autowired
private SysUserFeign sysUserFeign; private SysUserFeign sysUserFeign;
@ -298,7 +301,7 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
if (r == 1) { if (r == 1) {
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.LOANOTHERPOLICYRECORDAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.LOANOTHERPOLICYRECORDAPPLY.getProDefId());
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) { if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg()); return rb.setMsg(voResultBean.getMsg());
} }
@ -368,7 +371,7 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
LoanFinOtherPolicyRecordApply recordApply = this.fetchBySid(businessSid); LoanFinOtherPolicyRecordApply recordApply = this.fetchBySid(businessSid);
if (bv.getTaskId().equals(recordApply.getTaskId())) { if (bv.getTaskId().equals(recordApply.getTaskId())) {
bv.setOrgSidPath(recordApply.getOrgSidPath()); bv.setOrgSidPath(recordApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
@ -437,7 +440,7 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); variables = flowableFeign.getMap(flowProcessMapQuery).getData();
//======================================= //=======================================
bv.setFormVariables(variables); bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) { if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg()); return rb.setMsg(resultBean1.getMsg());
} }

9
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java

@ -8,6 +8,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@ -64,6 +65,8 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired @Autowired
private FlowFeign flowFeign;
@Autowired
private MessageFeign messageFeign; private MessageFeign messageFeign;
@Autowired @Autowired
private SysUserFeign sysUserFeign; private SysUserFeign sysUserFeign;
@ -329,7 +332,7 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
if (r == 1) { if (r == 1) {
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.LOANFINPOLICYRECORDAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.LOANFINPOLICYRECORDAPPLY.getProDefId());
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) { if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg()); return rb.setMsg(voResultBean.getMsg());
} }
@ -405,7 +408,7 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
LoanFinPolicyRecordApply recordApply = this.fetchBySid(businessSid); LoanFinPolicyRecordApply recordApply = this.fetchBySid(businessSid);
if (bv.getTaskId().equals(recordApply.getTaskId())) { if (bv.getTaskId().equals(recordApply.getTaskId())) {
bv.setOrgSidPath(recordApply.getOrgSidPath()); bv.setOrgSidPath(recordApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
@ -647,7 +650,7 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); variables = flowableFeign.getMap(flowProcessMapQuery).getData();
//======================================= //=======================================
bv.setFormVariables(variables); bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) { if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg()); return rb.setMsg(resultBean1.getMsg());
} }

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@ -685,7 +685,7 @@ public class AppBusSalesOrderService {
List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList()); List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
flowOrderVo.setList(list); flowOrderVo.setList(list);
} }
if ("3".equals(busSalesOrder.getType()) || StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())) { if ("3".equals(busSalesOrder.getType()) || (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
flowOrderVo.setShow(true); flowOrderVo.setShow(true);
} else { } else {
flowOrderVo.setShow(false); flowOrderVo.setShow(false);

Loading…
Cancel
Save