|
@@ -193,10 +193,13 @@ public class FlowInstanceServiceImpl extends BaseServiceImpl<FlowInstanceDao, Fl
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Override
|
|
@Override
|
|
public void reject(String instanceId) {
|
|
public void reject(String instanceId) {
|
|
|
|
+ FormInfo form = flowInstanceService.getForm(instanceId);
|
|
|
|
+ String fromName = form.getFlowDefine().getName();
|
|
|
|
+ String name = form.getFormName();
|
|
|
|
+
|
|
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
|
|
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
|
|
.processInstanceId(instanceId)
|
|
.processInstanceId(instanceId)
|
|
.singleResult();
|
|
.singleResult();
|
|
- String formTitle = processInstance.getName();
|
|
|
|
if (Objects.isNull(processInstance)) {
|
|
if (Objects.isNull(processInstance)) {
|
|
throw new BaseException("流程实例不存在");
|
|
throw new BaseException("流程实例不存在");
|
|
}
|
|
}
|
|
@@ -209,10 +212,9 @@ public class FlowInstanceServiceImpl extends BaseServiceImpl<FlowInstanceDao, Fl
|
|
notify.setSubject("申请拒绝");
|
|
notify.setSubject("申请拒绝");
|
|
|
|
|
|
// notify.setContent(String.format("您申请的流程《%s》已拒绝", processInstance.getName()));
|
|
// notify.setContent(String.format("您申请的流程《%s》已拒绝", processInstance.getName()));
|
|
- notify.setContent(formTitle + "-" + "已完结");
|
|
|
|
|
|
+ notify.setContent(name + "-" + "已完结");
|
|
|
|
+
|
|
|
|
|
|
- FormInfo form = flowInstanceService.getForm(instanceId);
|
|
|
|
- String fromName = form.getFlowDefine().getName();
|
|
|
|
notify.setSubject("申请拒绝" + "-" + fromName);
|
|
notify.setSubject("申请拒绝" + "-" + fromName);
|
|
|
|
|
|
notify.setSender(SecurityContextUtil.getUserId());
|
|
notify.setSender(SecurityContextUtil.getUserId());
|