|
|
@ -211,7 +211,8 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> { |
|
|
|
BeanUtil.copyProperties(ufVo, oaFormFlowDto); |
|
|
|
updateFlow(oaFormFlowDto); |
|
|
|
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { |
|
|
|
|
|
|
|
// 更新办结日期
|
|
|
|
updateClosingDate(businessSid); |
|
|
|
} else { |
|
|
|
//极光推送
|
|
|
|
oaForm = fetchBySid(businessSid); |
|
|
@ -249,6 +250,12 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private void updateClosingDate(String businessSid) { |
|
|
|
OaForm oaForm = fetchBySid(businessSid); |
|
|
|
oaForm.setFinishTime(new Date()); |
|
|
|
baseMapper.updateById(oaForm); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取上一环节 |
|
|
|
* |
|
|
@ -503,7 +510,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> { |
|
|
|
if (r == 1) { |
|
|
|
//启动流程
|
|
|
|
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv); |
|
|
|
if(voResultBean.getSuccess()){ |
|
|
|
if (voResultBean.getSuccess()) { |
|
|
|
UpdateFlowFieldVo ufVo = voResultBean.getData(); |
|
|
|
OaFormFlowDto oaFormFlowDto = new OaFormFlowDto(); |
|
|
|
BeanUtil.copyProperties(ufVo, oaFormFlowDto); |
|
|
@ -531,7 +538,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
return voResultBean; |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
return rb.setMsg(voResultBean.getMsg()); |
|
|
|
} |
|
|
|
|
|
|
|