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

移动端销售订单销售经理角色sid修复

master
dimengzhe 3 years ago
parent
28d400255c
commit
b2c2f13ec1
1 changed files with 27 additions and 7 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. 34
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

34
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -996,7 +996,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
//销售经理的角色sid
String roleSid = "f0a79b5e-5338-435e-b0c6-08fc01048f55";
// String roleSid = "f0a79b5e-5338-435e-b0c6-08fc01048f55";
String roleSid = "f07e98d3-d179-48ee-a5ff-5928addead3f";
//查询销售支持部经理是否超权限
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(sid);
BaseBrandMitQuery baseBrandMitQuery = new BaseBrandMitQuery();
@ -1029,6 +1030,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
//总经理的角色sid
// roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
//查询总经理审批是否超权限
/* baseOrderPostPriceQuery = new BaseOrderPostPriceQuery();
@ -1169,6 +1171,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
//更新业务中的流程相关的参数
updateFlowFiled(map);
BusSalesOrder busSalesOrder1 = fetchBySid(query.getBusinessSid());
String procId1 = busSalesOrder1.getProcInstId();
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId1);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getStaffSid())) {
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if ("现车".equals(vo.getOrderType())) {
//更新已选择的车架号的状态为未锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid());
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
busMainDepositUpdateQuery.setVinSidList(list);
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
}
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
@ -1187,10 +1207,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
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(busSalesOrder.get().getStaffSid())) {
ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
List<String> receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(","));
if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getStaffSid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@ -1199,7 +1219,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
messageFlowableQuery.setMsgTitle("销售订单");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
Future future2 = pool.submit(() -> {
/*Future future2 = pool.submit(() -> {
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
@ -1216,7 +1236,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
}
}
});
});*/
} catch (Exception e) {
e.printStackTrace();

Write Preview
Loading…
Cancel
Save