|
@ -503,6 +503,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> { |
|
|
if (r == 1) { |
|
|
if (r == 1) { |
|
|
//启动流程
|
|
|
//启动流程
|
|
|
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv); |
|
|
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv); |
|
|
|
|
|
if(voResultBean.getSuccess()){ |
|
|
UpdateFlowFieldVo ufVo = voResultBean.getData(); |
|
|
UpdateFlowFieldVo ufVo = voResultBean.getData(); |
|
|
OaFormFlowDto oaFormFlowDto = new OaFormFlowDto(); |
|
|
OaFormFlowDto oaFormFlowDto = new OaFormFlowDto(); |
|
|
BeanUtil.copyProperties(ufVo, oaFormFlowDto); |
|
|
BeanUtil.copyProperties(ufVo, oaFormFlowDto); |
|
@ -530,6 +531,11 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> { |
|
|
e.printStackTrace(); |
|
|
e.printStackTrace(); |
|
|
} |
|
|
} |
|
|
return voResultBean; |
|
|
return voResultBean; |
|
|
|
|
|
}else{ |
|
|
|
|
|
return rb.setMsg(voResultBean.getMsg()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else if (r == 2) { |
|
|
} else if (r == 2) { |
|
|
BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto(); |
|
|
BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto(); |
|
|
BeanUtil.copyProperties(bv, businessVariablesDto); |
|
|
BeanUtil.copyProperties(bv, businessVariablesDto); |
|
|