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

消息推送-驳回修改为以环节名称作为判断

master
dimengzhe 2 years ago
parent
9149edb50e
commit
bb382e3f55
7 changed files with 74 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  2. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
  3. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  4. 33
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
  5. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  6. 11
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  7. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

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

@ -564,8 +564,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -665,8 +665,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -720,8 +720,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -795,16 +795,18 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseInternalPurchase.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseInternalPurchase.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_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
View File

@ -356,8 +356,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseModelModprice.getProcInstId());
ufVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowVo.setProcInsId(baseModelModprice.getProcInstId());
messageFlowVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -428,16 +428,18 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseModelModprice.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("车型调价申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseModelModprice.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseModelModprice.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -37,14 +37,12 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.flow.FlowTaskVo;
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
@ -495,7 +493,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowVo.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -503,7 +501,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("外采申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
//======================添加消息推送结束
return resultBean1;
} else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
@ -519,8 +516,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
uff.setProcDefId(baseOutsourcingApplication.getProcDefId());
messageFlowVo.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowVo.setProcDefId(baseOutsourcingApplication.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -528,7 +525,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("外采申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
//======================添加消息推送结束
return rb;
} else {
@ -612,7 +608,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowVo.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -815,15 +811,18 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(data, messageFlowVo);
String procId = baseOutsourcingApplication.getProcInstSid();
data.setProcInsId(procId);
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseOutsourcingApplication.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(flowTaskVo.getBusinessSid());
messageFlowableQuery.setModuleName("外采申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@ -831,7 +830,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
messageFlowableQuery.setMsgTitle("外采申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(data, appMap, baseOutsourcingApplication);
//======================添加消息推送结束
return resultBean;
} else {

33
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
View File

@ -152,7 +152,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
//新增
//=======================================
String orgSidPath = scmVehicleActualSalesDto.getOrgSidPath();
if(StringUtils.isBlank(scmVehicleActualSalesDto.getOrgSidPath())){
if (StringUtils.isBlank(scmVehicleActualSalesDto.getOrgSidPath())) {
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(scmVehicleActualSalesDto.getUserSid());
if (!userVoResultBean.getSuccess()) {
@ -192,7 +192,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
if (baseVehicleActualSales == null) {
return rb.setMsg("该申请不存在");
}
BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales,"orgSidPath");
BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales, "orgSidPath");
int i = baseMapper.updateById(baseVehicleActualSales);
//查询details中是否有关于sales的该条sid数据
List<BaseVehicleActualDetails> scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid);
@ -316,17 +316,17 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
if (dto.getDetailsList().size() == 0) {
return rb.setMsg("请选择未售买断的车辆");
}else{
} else {
List<BaseVehicleActualDetailsDto> busVehicleApplyDetailList = dto.getDetailsList();
busVehicleApplyDetailList.removeAll(Collections.singleton(null));
List<String> stringList = new ArrayList<>();
if (!busVehicleApplyDetailList.isEmpty()) {
for (BaseVehicleActualDetailsDto d : busVehicleApplyDetailList) {
String vinNo = d.getVinNo();
String vinNo = d.getVinNo();
//根据车型查询品牌是否一致
BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(vinNo, useOrgSid);
String brandSid = baseVehicle.getCarBrandSid();
if(!dto.getCarBrandSid().equals(brandSid)){
if (!dto.getCarBrandSid().equals(brandSid)) {
return rb.setMsg("选择的车辆的品牌与选择的品牌不一致");
}
stringList.add(brandSid);
@ -497,8 +497,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
ufVo.setProcInsId(baseVehicleActualSales.getProcInstId());
messageFlowVo.setProcDefId(baseVehicleActualSales.getProcDefId());
messageFlowVo.setProcInsId(baseVehicleActualSales.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -623,16 +623,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseVehicleActualSales.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseVehicleActualSales.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("未售买断申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) {
if ("未售买断申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
//更新未售买断状态为未买断
//更新车辆状态为未买断
@ -675,12 +677,21 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if (query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())) {
baseVehicleActualSales = fetchBySid(query.getBusinessSid());
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(baseVehicleActualSales.getProcInstId());
String nextName = listResultBean.getData().get(0).getName_();
if ("未售买断申请".equals(nextName)) {
//更新车辆状态为未买断
String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
}
/*if (query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())) {
//更新车辆状态为未买断
String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
}*/
return rb.success().setData(resultBean.getData());
}
}

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
View File

@ -611,8 +611,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(busVehicleApply.getProcDefId());
ufVo.setProcInsId(busVehicleApply.getProcInstId());
messageFlowVo.setProcDefId(busVehicleApply.getProcDefId());
messageFlowVo.setProcInsId(busVehicleApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -725,16 +725,18 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = busVehicleApply.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(busVehicleApply.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(busVehicleApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("厂家采购申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextName = listResultBean.getData().get(0).getName_();
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

11
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
View File

@ -1112,15 +1112,18 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = scmVehicleGression.getProcInstId();
ufVo.setProcInsId(procId);
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(scmVehicleGression.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("存放地点变更申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
//清除临时车辆表状态
baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
@ -1163,8 +1166,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
String procId = scmVehicleGression.getProcInstId();
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
//清除临时车辆表状态
baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
}

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

@ -314,8 +314,8 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(scmVehicleReturn.getInstanceId());
uff.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowVo.setProcInsId(scmVehicleReturn.getInstanceId());
messageFlowVo.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -421,8 +421,8 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(scmVehicleReturn.getInstanceId());
uff.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowVo.setProcInsId(scmVehicleReturn.getInstanceId());
messageFlowVo.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -750,7 +750,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
stringObjectMap.put("procInstSid", boad.getInstanceId());
stringObjectMap.put("procDefId", boad.getProcDefId());
stringObjectMap.put("nodeState", data.getNodeState());
if (data.getNodeState().equals("采购退库申请")){
if (data.getNodeState().equals("发起申请")){
List<ScmVehicleReturnDetails> scmVehicleReturnDetails = scmVehicleReturnDetailsService.selectByReturnSid(flowTaskVo.getBusinessSid());
List<BaseVehicleDto> baseVehicleDtos = new ArrayList<>();
for (ScmVehicleReturnDetails scmVehicleReturnDetail : scmVehicleReturnDetails) {
@ -771,16 +771,18 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
String procId = scmVehicleReturn.getInstanceId();
uff.setProcInsId(procId);
uff.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(flowTaskVo.getBusinessSid());
messageFlowableQuery.setModuleName("采购退库申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleReturn.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleReturn.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

Write Preview
Loading…
Cancel
Save