|
|
|
@ -5,9 +5,12 @@ import cn.hutool.core.convert.Convert; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto; |
|
|
|
import com.yxt.anrui.base.api.baseoutsourcingapplication.SubmitBaseOutSourcingApplicationDto; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleUpdateQuery; |
|
|
|
import com.yxt.anrui.flowable.api.flow.FlowableFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTask; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; |
|
|
|
@ -18,8 +21,10 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; |
|
|
|
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; |
|
|
|
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; |
|
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; |
|
|
|
import com.yxt.anrui.scm.api.scmvehiclereturn.*; |
|
|
|
import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetails; |
|
|
|
import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailssVo; |
|
|
|
@ -101,9 +106,9 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
//验证数据是否可更改
|
|
|
|
if (checkCouldChange(sid)) { |
|
|
|
/* if (checkCouldChange(sid)) { |
|
|
|
return rb.setMsg("该条信息不可更改"); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
if (scmVehicleReturnDto.getDetailsList().size() == 0) { |
|
|
|
return rb.setMsg("请选择需要退库的车辆"); |
|
|
|
} |
|
|
|
@ -183,12 +188,69 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean submitVehicleReturn(ScmVehicleReturnDto scmVehicleReturnDto) { |
|
|
|
ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(scmVehicleReturnDto.getUserSid()); |
|
|
|
//取组织架构的全路径sid
|
|
|
|
SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()).getData(); |
|
|
|
String orgSidPath = sysStaffOrg.getOrgSidPath(); |
|
|
|
Map<String, Object> variables = BeanUtil.beanToMap(scmVehicleReturnDto); |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String orgSid = checkUserOrg(scmVehicleReturnDto.getUserSid()); |
|
|
|
if (scmVehicleReturnDto.getDetailsList().size() == 0) { |
|
|
|
return rb.setMsg("请选择需要退库的车辆"); |
|
|
|
} |
|
|
|
ResultBean resultBean = saveOrUpdateVehicleReturn(scmVehicleReturnDto); |
|
|
|
String busSid = scmVehicleReturnDto.getBusinessSid(); |
|
|
|
if (org.apache.commons.lang3.StringUtils.isBlank(busSid)) { |
|
|
|
ResultBean resultBean = saveOrUpdateVehicleReturn(scmVehicleReturnDto); |
|
|
|
// ResultBean resultBean = saveOrUpdateDto(dto);//insert
|
|
|
|
String businessSid = resultBean.getData().toString(); |
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
BeanUtil.copyProperties(scmVehicleReturnDto, bv); |
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
bv.setUserSid(scmVehicleReturnDto.getUserSid()); |
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId()); |
|
|
|
//如果taskid从业务的数据库中查询出来，那这个taskid 和当前的关系是什么 如果数据库中查询出来的taskid是第四个环节的id,但是目前是做的第一次的提交操作。
|
|
|
|
// 应该是也不允许走if 也不运行走else 那应该如何验证这个id是否允许走else呢？
|
|
|
|
// 取出来业务数据的taskid和前端传递的taskid作比较 来判断数据的是否有效 本质上是数据版本一致性的问题
|
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv); |
|
|
|
UpdateFlowFieldVo uff = resultBean1.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(uff)); |
|
|
|
return resultBean1; |
|
|
|
} |
|
|
|
Map<String,Object> mm= submitBusinessData(scmVehicleReturnDto, busSid); |
|
|
|
int r=(int)mm.get("r"); |
|
|
|
ScmVehicleReturnDto booad = (ScmVehicleReturnDto) mm.get("bean"); |
|
|
|
if (r == 0) { |
|
|
|
return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!"); |
|
|
|
} |
|
|
|
|
|
|
|
ResultBean resultBean = saveOrUpdateVehicleReturn(scmVehicleReturnDto);//update
|
|
|
|
String businessSid = resultBean.getData().toString(); |
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
BeanUtil.copyProperties(scmVehicleReturnDto, bv); |
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
bv.setUserSid(scmVehicleReturnDto.getUserSid()); |
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId()); |
|
|
|
//如果taskid从业务的数据库中查询出来，那这个taskid 和当前的关系是什么 如果数据库中查询出来的taskid是第四个环节的id,但是目前是做的第一次的提交操作。
|
|
|
|
// 应该是也不允许走if 也不运行走else 那应该如何验证这个id是否允许走else呢？
|
|
|
|
// 取出来业务数据的taskid和前端传递的taskid作比较 来判断数据的是否有效 本质上是数据版本一致性的问题
|
|
|
|
|
|
|
|
if (r == 1) { |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv); |
|
|
|
UpdateFlowFieldVo uff = resultBean1.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(uff)); |
|
|
|
return resultBean1; |
|
|
|
} else if (r == 2) { |
|
|
|
bv.setTaskDefKey(booad.getTaskDefKey()); |
|
|
|
bv.setComment(org.apache.commons.lang3.StringUtils.isNotBlank(scmVehicleReturnDto.getComment()) ? scmVehicleReturnDto.getComment() : "重新提交"); |
|
|
|
bv.setInstanceId(booad.getInstanceId()); |
|
|
|
return complete(bv); |
|
|
|
} |
|
|
|
return ResultBean.fireFail();/* |
|
|
|
if (resultBean.getSuccess()) { |
|
|
|
String businessSid = resultBean.getData().toString(); |
|
|
|
//判断车辆的状态是否包含采购退库的状态，如果是的话，返回审核失败
|
|
|
|
@ -202,7 +264,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
if (Integer.parseInt(scmVehicleReturnDto.getMoney()) > 0) { |
|
|
|
variables.put("isLoan", true); |
|
|
|
@ -210,16 +271,18 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
variables.put("isLoan", false); |
|
|
|
} |
|
|
|
variables.put("orgSid", orgSid);//部门sid
|
|
|
|
ResultBean businessResultBean =null;// flowableFeign.businessStart(ProcDefEnum.SCMVEHICLERETURN.getProDefId(), scmVehicleReturnDto.getUserSid(), variables);
|
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
BeanUtil.copyProperties(scmVehicleReturnDto, bv); |
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
bv.setUserSid(scmVehicleReturnDto.getUserSid()); |
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId()); |
|
|
|
ResultBean<UpdateFlowFieldVo> businessResultBean =flowableFeign.startProcess(bv);//flowableFeign.businessStart(bv);
|
|
|
|
if (businessResultBean.getSuccess() && businessResultBean.getData() != null) { |
|
|
|
Map<String, String> map = (Map<String, String>) businessResultBean.getData(); |
|
|
|
//更新退库业务表中的流程状态
|
|
|
|
modifyFlowState(businessSid, |
|
|
|
ProcDefEnum.SCMVEHICLERETURN.getProDefId(),//procDefId
|
|
|
|
map.get("nodeState"),//state
|
|
|
|
map.get("procInsId"),//procInstSid
|
|
|
|
map.get("taskDefKey")//nodeSid
|
|
|
|
); |
|
|
|
UpdateFlowFieldVo uff = businessResultBean.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(uff)); |
|
|
|
} else { |
|
|
|
return rb.setMsg(businessResultBean.getMsg()); |
|
|
|
} |
|
|
|
@ -227,9 +290,25 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
|
|
|
|
return resultBean; |
|
|
|
return resultBean;*/ |
|
|
|
} |
|
|
|
|
|
|
|
private synchronized Map<String,Object> submitBusinessData(ScmVehicleReturnDto dto, |
|
|
|
String businessSid ) { |
|
|
|
Map<String,Object> map=new HashMap<>(); |
|
|
|
int r = 0; |
|
|
|
ScmVehicleReturnDto booad = baseMapper.getBySid(businessSid); |
|
|
|
String businessTaskid = booad.getTaskId(); |
|
|
|
if (org.apache.commons.lang3.StringUtils.isBlank(businessTaskid) && org.apache.commons.lang3.StringUtils.isBlank(dto.getTaskId())) { |
|
|
|
// 新提交 taskid都是空的
|
|
|
|
r = 1; |
|
|
|
} else if (org.apache.commons.lang3.StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
|
|
|
|
r = 2; |
|
|
|
} |
|
|
|
map.put("r",r); |
|
|
|
map.put("bean",booad); |
|
|
|
return map; |
|
|
|
} |
|
|
|
/** |
|
|
|
* 查询用户是否设置了部门 |
|
|
|
* * |
|
|
|
@ -247,58 +326,42 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
return orgSid; |
|
|
|
} |
|
|
|
|
|
|
|
private void modifyFlowState(String businessSid, String proDefId, String nodeState, |
|
|
|
String procInsId, |
|
|
|
String taskDefKey) { |
|
|
|
baseMapper.modifyFlowState(businessSid, |
|
|
|
proDefId,//procDefId
|
|
|
|
nodeState,//state
|
|
|
|
procInsId,//procInstSid
|
|
|
|
taskDefKey); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 办理流程 |
|
|
|
* |
|
|
|
* @param scmVehicleReturnFlowQuery 查询条件 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean complete(ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery) { |
|
|
|
public ResultBean complete( BusinessVariables bv) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
//查询对象转换为map集合
|
|
|
|
Map<String, Object> variables = Convert.toMap(String.class, Object.class, scmVehicleReturnFlowQuery); |
|
|
|
BusinessVariables bv = BusinessVariables.builder().build(); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
boolean isTrue = isTrue(scmVehicleReturnFlowQuery.getBusinessSid()); |
|
|
|
boolean isTrue = isTrue(bv.getBusinessSid()); |
|
|
|
if (isTrue) { |
|
|
|
return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆"); |
|
|
|
} |
|
|
|
ResultBean<FlowTask> resultBean = flowTaskFeign.businessComplete(bv); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return resultBean; |
|
|
|
} |
|
|
|
String nodeState = ""; |
|
|
|
String taskDefKey = ""; |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("businessSid", variables.get("businessSid").toString()); |
|
|
|
if (resultBean.getData() != null) { |
|
|
|
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId()); |
|
|
|
if (listResultBean.getSuccess() && listResultBean.getData().size() != 0) { |
|
|
|
nodeState = listResultBean.getData().get(0).getName_(); |
|
|
|
taskDefKey = listResultBean.getData().get(0).getTask_def_key_(); |
|
|
|
} else { |
|
|
|
nodeState = ProcessStateEnum.FINISHED.getStateName(); |
|
|
|
taskDefKey = "Event_end"; |
|
|
|
map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode()); |
|
|
|
updateByVinNo(scmVehicleReturnFlowQuery.getBusinessSid()); |
|
|
|
|
|
|
|
bv.getFormVariables().put("isLoan",true); |
|
|
|
|
|
|
|
ScmVehicleReturnDto booad = baseMapper.getBySid(bv.getBusinessSid()); |
|
|
|
String businessTaskid = booad.getTaskId(); |
|
|
|
if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步
|
|
|
|
ResultBean<UpdateFlowFieldVo> rb1 = flowableFeign.handleProsess(bv); |
|
|
|
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb1.getData()); |
|
|
|
updateFlowFiled(stringObjectMap); |
|
|
|
return rb1; |
|
|
|
} else { |
|
|
|
return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!"); |
|
|
|
} |
|
|
|
} |
|
|
|
map.put("nodeState", nodeState); |
|
|
|
map.put("taskDefKey", taskDefKey); |
|
|
|
sysFormLinkFeign.updateFiled(map); |
|
|
|
return rb.success(); |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 更新流程相关的状态 |
|
|
|
* |
|
|
|
* @param map |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private int updateFlowFiled(Map<String, Object> map) { |
|
|
|
return baseMapper.updateFlowFiled(map); |
|
|
|
} |
|
|
|
|
|
|
|
public Boolean isTrue(String businessSid) { |
|
|
|
@ -363,8 +426,21 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
return new ResultBean().success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean breakProcess(ScmVehicleReturnFlowDto dto) { |
|
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
|
public ResultBean breakProcess(com.yxt.anrui.scm.api.flow.FlowTaskVo flowTaskVo) { |
|
|
|
FlowTaskVo fl = new FlowTaskVo(); |
|
|
|
ScmVehicleReturnDto booad = baseMapper.getBySid(flowTaskVo.getBusinessSid()); |
|
|
|
String businessTaskid = booad.getTaskId(); |
|
|
|
if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
|
|
|
|
BeanUtil.copyProperties(flowTaskVo, fl); |
|
|
|
fl.setBusinessSid(flowTaskVo.getBusinessSid()); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(fl); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
return resultBean; |
|
|
|
}else{ |
|
|
|
return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!"); |
|
|
|
} |
|
|
|
|
|
|
|
/* FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(dto, flowTaskVo); |
|
|
|
ResultBean resultBean = flowTaskFeign.breakProcess(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
@ -376,10 +452,25 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
map.put("taskDefKey", "Event_end"); |
|
|
|
map.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode()); |
|
|
|
sysFormLinkFeign.updateFiled(map); |
|
|
|
return resultBean.success(); |
|
|
|
return resultBean.success();*/ |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean revokeProcess(ScmVehicleReturnFlowDto dto) { |
|
|
|
public ResultBean revokeProcess(com.yxt.anrui.scm.api.flow.FlowTaskVo flowTaskVo) { |
|
|
|
ScmVehicleReturnDto booad = baseMapper.getBySid(flowTaskVo.getBusinessSid()); |
|
|
|
String businessTaskid = booad.getTaskId(); |
|
|
|
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); |
|
|
|
if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
|
|
|
|
BeanUtil.copyProperties(flowTaskVo, fl); |
|
|
|
fl.setBusinessSid(flowTaskVo.getBusinessSid()); |
|
|
|
fl.setUserSid(flowTaskVo.getUserSid()); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(fl); |
|
|
|
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(resultBean.getData()); |
|
|
|
updateFlowFiled(stringObjectMap); |
|
|
|
return resultBean; |
|
|
|
}else{ |
|
|
|
return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!"); |
|
|
|
} |
|
|
|
/* |
|
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(dto, flowTaskVo); |
|
|
|
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.revokeProcess(flowTaskVo); |
|
|
|
@ -400,7 +491,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
map.put("taskDefKey", taskDefKey); |
|
|
|
} |
|
|
|
sysFormLinkFeign.updateFiled(map); |
|
|
|
return new ResultBean().success(); |
|
|
|
return new ResultBean().success();*/ |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<ScmVehicleReturnDetailsVo> details(String sid) { |
|
|
|
@ -428,4 +519,49 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn |
|
|
|
delBySids(sidsList); |
|
|
|
return rb.success().setMsg("删除成功"); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean getNextNodesForSubmit(ScmVehicleReturnDto scmVehicleReturnDto) { |
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId()); |
|
|
|
bv.setTaskDefKey(scmVehicleReturnDto.getTaskDefKey()); |
|
|
|
bv.setFormVariables(BeanUtil.beanToMap(scmVehicleReturnDto)); |
|
|
|
bv.getFormVariables().put("isLoan",true); |
|
|
|
ResultBean processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv); |
|
|
|
processCirculationNodesByMap.setCode("200"); |
|
|
|
processCirculationNodesByMap.setSuccess(true); |
|
|
|
return processCirculationNodesByMap; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean getPreviousNodesForReject(ScmVehicleReturnFlowDto dto) { |
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
bv.setTaskDefKey(dto.getTaskDefKey()); |
|
|
|
bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId()); |
|
|
|
bv.setFormVariables(BeanUtil.beanToMap(dto)); |
|
|
|
ResultBean processCirculationNodesByMap = flowTaskFeign.getPreviousNodesForReject(bv); |
|
|
|
processCirculationNodesByMap.setCode("200"); |
|
|
|
processCirculationNodesByMap.setSuccess(true); |
|
|
|
return processCirculationNodesByMap; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public ResultBean taskReject(com.yxt.anrui.scm.api.flow.FlowTaskVo flowTaskVo) { |
|
|
|
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); |
|
|
|
ScmVehicleReturnDto booad = baseMapper.getBySid(flowTaskVo.getBusinessSid()); |
|
|
|
String businessTaskid = booad.getTaskId(); |
|
|
|
if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
|
|
|
|
BeanUtil.copyProperties(flowTaskVo, fl); |
|
|
|
ScmVehicleReturnDto boad = baseMapper.getBySid(flowTaskVo.getBusinessSid()); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(fl); |
|
|
|
UpdateFlowFieldVo data = resultBean.getData(); |
|
|
|
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(resultBean.getData()); |
|
|
|
stringObjectMap.put("taskDefKey", data.getTaskDefKey()); |
|
|
|
stringObjectMap.put("procInstSid", boad.getInstanceId()); |
|
|
|
stringObjectMap.put("procDefId", boad.getProcDefId()); |
|
|
|
stringObjectMap.put("nodeState", data.getNodeState()); |
|
|
|
updateFlowFiled(stringObjectMap); |
|
|
|
return resultBean; |
|
|
|
}else{ |
|
|
|
return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
yxt_djz
3 years ago