|
|
@ -753,6 +753,22 @@ public class BaseDistributorApplyService extends MybatisBaseService<BaseDistribu |
|
|
|
BaseDistributorApply baseDistributorApply = this.fetchBySid(businessSid); |
|
|
|
if (bv.getTaskId().equals(baseDistributorApply.getTaskId())) { |
|
|
|
bv.setOrgSidPath(baseDistributorApply.getOrgSidPath()); |
|
|
|
//流程中的参数赋值
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
//若有网关,则赋值网关中判断的字段。
|
|
|
|
boolean isDecide = true; |
|
|
|
//去查询是否同意
|
|
|
|
if (StringUtils.isNotBlank(baseDistributorApply.getAgree())) { |
|
|
|
if (baseDistributorApply.getAgree().equals("0")) { |
|
|
|
isDecide = false; |
|
|
|
} |
|
|
|
} |
|
|
|
variables.put("isDecide", isDecide); |
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
@ -1044,6 +1060,15 @@ public class BaseDistributorApplyService extends MybatisBaseService<BaseDistribu |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
//若有网关,则赋值网关中判断的字段。
|
|
|
|
boolean isDecide = true; |
|
|
|
//去查询是否同意
|
|
|
|
if (StringUtils.isNotBlank(baseDistributorApply.getAgree())) { |
|
|
|
if (baseDistributorApply.getAgree().equals("0")) { |
|
|
|
isDecide = false; |
|
|
|
} |
|
|
|
} |
|
|
|
variables.put("isDecide", isDecide); |
|
|
|
flowTaskVo.setValues(variables); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|