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

简易订单驳回推送消息修改为以环节名称判断

zhanglei
dimengzhe 2 years ago
parent
ca8348f936
commit
9149edb50e
1 changed files with 11 additions and 5 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. 16
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

16
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
View File

@ -2256,8 +2256,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(busMainDeposit.get().getProcInsId());
ufVo.setProcDefId(busMainDeposit.get().getProcDefId());
messageFlowVo.setProcInsId(busMainDeposit.get().getProcInsId());
messageFlowVo.setProcDefId(busMainDeposit.get().getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
@ -2268,8 +2268,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
}
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(busMainDeposit.get().getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
if ("销售专员申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@ -2280,8 +2282,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
Future future2 = pool.submit(() -> {
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(busMainDeposit.get().getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
if ("销售专员申请".equals(nextName)) {
//更新已选择的车架号的状态为未锁定
AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
@ -2323,9 +2327,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
String procId = busMainDeposit.getProcInsId();
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 (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
if ("销售专员申请".equals(nextName)) {
//更新已选择的车架号的状态为未锁定
AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
if (appBusDepositVehicleDetailVo != null) {

Write Preview
Loading…
Cancel
Save