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

调车流程问题修改

master
God 3 years ago
parent
bf6fe21474
commit
6ba76c2583
1 changed files with 66 additions and 58 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. 124
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

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

@ -300,7 +300,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle.getVinNo(), dto.getCreateOrgSid());
if (baseVehicle.getVehicleState().equals("0009")){
if (baseVehicle.getVehicleState().equals("0009")) {
return rb.setMsg("选择的车架号为" + baseVehicle.getVinNo() + "的车辆已在审批过程中，请重新选择");
}
}
@ -353,27 +353,23 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//调车提交后 修改车辆台账中的调车状态 为 调车中
String shuntingTypeKey = dto.getShuntingTypeKey();
if (shuntingTypeKey.equals("02")) {
for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicleDto : baseInternalPurchaseVehicles) {
BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(baseInternalPurchaseVehicleDto.getVinNo());
baseVehicle.setVinNo(baseInternalPurchaseVehicleDto.getVinNo());
baseVehicle.setVehicleState(VehicleState.StockEnum.DCZ_STOCK.getCode());
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.DCZ_STOCK.getRemarks());
baseVehicleService.updateVeh(baseVehicle);
}
for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicleDto : baseInternalPurchaseVehicles) {
BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(baseInternalPurchaseVehicleDto.getVinNo());
baseVehicle.setVinNo(baseInternalPurchaseVehicleDto.getVinNo());
baseVehicle.setVehicleState(VehicleState.StockEnum.DCZ_STOCK.getCode());
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.DCZ_STOCK.getRemarks());
baseVehicleService.updateVeh(baseVehicle);
}
//=======================消息推送开始
baseInternalPurchase = fetchBySid(businessSid);
baseInternalPurchase = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("分公司间调车申请");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("分公司间调车");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
//=======================消息推送结束
@ -389,6 +385,13 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
bv.setTaskDefKey(baseInternalPurchase.getNodeSid());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId());
for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicleDto : baseInternalPurchaseVehicles) {
BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(baseInternalPurchaseVehicleDto.getVinNo());
baseVehicle.setVinNo(baseInternalPurchaseVehicleDto.getVinNo());
baseVehicle.setVehicleState(VehicleState.StockEnum.DCZ_STOCK.getCode());
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.DCZ_STOCK.getRemarks());
baseVehicleService.updateVeh(baseVehicle);
}
return complete(bv);
}
return rb;
@ -472,10 +475,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
}
}
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
Map<String,Object> variables = new HashMap<>();
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",bv.getBusinessSid());
variables.put("app",appMap);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -546,20 +549,20 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
}
}
}
}else{
} else {
//极光推送
UpdateFlowFieldVo ufVo = resultBean.getData();
baseInternalPurchase = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("分公司间调车申请");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("分公司间调车");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
}
@ -620,10 +623,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
bv.setNextNodeUserSids(substring);
}
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
Map<String,Object> variables = new HashMap<>();
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",bv.getBusinessSid());
variables.put("app",appMap);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -635,14 +638,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
baseInternalPurchase = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("分公司间调车申请");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("分公司间调车");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success().setData(resultBean.getData());
@ -674,10 +677,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
Map<String,Object> variables = new HashMap<>();
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",bv.getBusinessSid());
variables.put("app",appMap);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) {
@ -689,14 +692,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
baseInternalPurchase = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("分公司间调车申请");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("分公司间调车");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success().setData(resultBean1.getData());
@ -740,9 +743,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",query.getBusinessSid());
flowTaskVo.getValues().put("app",appMap);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", query.getBusinessSid());
flowTaskVo.getValues().put("app", appMap);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -751,10 +754,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
//更新业务中的流程相关的参数
updateFlowFiled(map);
String nodeState = map.get("nodeState").toString();
if (nodeState.equals("调车申请")){
if (nodeState.equals("调车申请")) {
List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid());
for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(),VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicleVo.getVinNo(),baseInternalPurchase.getCreateOrgSid());
baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicleVo.getVinNo(), baseInternalPurchase.getCreateOrgSid());
}
}
//极光推送
@ -763,7 +766,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
baseInternalPurchase = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseInternalPurchase.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
@ -771,13 +774,13 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("分公司间调车申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
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(baseInternalPurchase.getCreateBySid())){
messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
}else{
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("分公司间调车");
@ -805,7 +808,15 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
String nodeState = map.get("nodeState").toString();
if (nodeState.equals("调车申请")) {
List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid());
for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicleVo.getVinNo(), baseInternalPurchase.getCreateOrgSid());
}
}
return rb.success().setData(resultBean.getData());
}
}
@ -831,16 +842,13 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//调车不通过时，修改车辆台账的调车状态 为 未调车
List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid());
if (baseInternalPurchase.getShuntingTypeKey().equals("02")) {
for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(baseInternalPurchaseVehicleVo.getVinNo());
baseVehicle.setVinNo(baseInternalPurchaseVehicleVo.getVinNo());
baseVehicle.setVehicleState(VehicleState.StockEnum.DCZ_STOCK.getCode());
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.DCZ_STOCK.getRemarks());
baseVehicleService.updateVeh(baseVehicle);
}
for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(baseInternalPurchaseVehicleVo.getVinNo());
baseVehicle.setVinNo(baseInternalPurchaseVehicleVo.getVinNo());
baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
baseVehicleService.updateVeh(baseVehicle);
}
return rb.success().setData(resultBean.getData());
}
@ -869,16 +877,16 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
appCompanyShuntingListVo.setCarDetailPage(appVehicleVersionVo);
appCompanyShuntingListVo.setEditVin("调入".equals(vo.getShuntingTypeValue()));
appCompanyShuntingListVo.setEditPrice("调出".equals(vo.getShuntingTypeValue()));
if(StringUtils.isBlank(appCompanyShuntingListVo.getWitPinMoney())){
if (StringUtils.isBlank(appCompanyShuntingListVo.getWitPinMoney())) {
appCompanyShuntingListVo.setWitPinMoney("-");
}
if(StringUtils.isBlank(appCompanyShuntingListVo.getFreight())){
if (StringUtils.isBlank(appCompanyShuntingListVo.getFreight())) {
appCompanyShuntingListVo.setFreight("-");
}
if(StringUtils.isBlank(appCompanyShuntingListVo.getFreightUndertakerName())){
if (StringUtils.isBlank(appCompanyShuntingListVo.getFreightUndertakerName())) {
appCompanyShuntingListVo.setFreightUndertakerName("-");
}
if(StringUtils.isBlank(appCompanyShuntingListVo.getRemarks())){
if (StringUtils.isBlank(appCompanyShuntingListVo.getRemarks())) {
appCompanyShuntingListVo.setRemarks("-");
}

Write Preview
Loading…
Cancel
Save