Commit 94dddaf3 by “zcwang”

add: 邮件发送位置确认

parent 6db5880c
...@@ -171,8 +171,10 @@ public class ChangeFlowBiz { ...@@ -171,8 +171,10 @@ public class ChangeFlowBiz {
changeRecord.setFlowNode(nodeId); changeRecord.setFlowNode(nodeId);
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeFlowService.updateRecord(changeRecord); changeFlowService.updateRecord(changeRecord);
// todo:502节点,发送邮件,变更执行
return flowId; return flowId;
} }
// todo: 变更发起人≠变更负责人,到达501节点,发送邮件,变更申请
return flowId; return flowId;
} }
...@@ -434,7 +436,7 @@ public class ChangeFlowBiz { ...@@ -434,7 +436,7 @@ public class ChangeFlowBiz {
List<ChangeFile> changeFiles = buildChangeFileRecord(changeRecord.getId(), files); List<ChangeFile> changeFiles = buildChangeFileRecord(changeRecord.getId(), files);
changeFiles.forEach(file -> changeFileService.saveRecord(file)); changeFiles.forEach(file -> changeFileService.saveRecord(file));
} }
// todo: 发送邮件 // todo: 502节点,发送邮件,变更执行
return submitNode; return submitNode;
case CHANGE_FLOW_CONFIRM: case CHANGE_FLOW_CONFIRM:
...@@ -468,7 +470,6 @@ public class ChangeFlowBiz { ...@@ -468,7 +470,6 @@ public class ChangeFlowBiz {
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeFlowService.updateRecord(changeRecord); changeFlowService.updateRecord(changeRecord);
changeExecRecordList.forEach(exec->changeFlowExecService.update(exec)); changeExecRecordList.forEach(exec->changeFlowExecService.update(exec));
//todo: 发送邮件
return confirmNode; return confirmNode;
case CANCEL: case CANCEL:
// 取消填写取消原因 // 取消填写取消原因
...@@ -480,7 +481,6 @@ public class ChangeFlowBiz { ...@@ -480,7 +481,6 @@ public class ChangeFlowBiz {
changeRecord.setFlowNode(cancelNode); changeRecord.setFlowNode(cancelNode);
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeFlowService.updateRecord(changeRecord); changeFlowService.updateRecord(changeRecord);
//todo: 发送邮件
return cancelNode; return cancelNode;
case DELAY: case DELAY:
// 延期不流转工单 // 延期不流转工单
...@@ -506,7 +506,6 @@ public class ChangeFlowBiz { ...@@ -506,7 +506,6 @@ public class ChangeFlowBiz {
changeFlowService.updateRecord(changeRecord); changeFlowService.updateRecord(changeRecord);
changeExecRecords1.forEach(exec->changeFlowExecService.update(exec)); changeExecRecords1.forEach(exec->changeFlowExecService.update(exec));
// 变更行动项 // 变更行动项
//todo: 发送邮件
return null; return null;
default: default:
return null; return null;
...@@ -565,6 +564,7 @@ public class ChangeFlowBiz { ...@@ -565,6 +564,7 @@ public class ChangeFlowBiz {
changeRecord.setState(ChangeStatusEnum.CANCEL.getStatus()); changeRecord.setState(ChangeStatusEnum.CANCEL.getStatus());
changeRecord.setCancelReason(req.getCancelReason()); changeRecord.setCancelReason(req.getCancelReason());
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
// todo:取消501节点,取消工单,发送邮件
return changeFlowService.updateRecord(changeRecord); return changeFlowService.updateRecord(changeRecord);
} }
...@@ -751,4 +751,10 @@ public class ChangeFlowBiz { ...@@ -751,4 +751,10 @@ public class ChangeFlowBiz {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST); throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST);
} }
} }
public void deliver() {
// todo:501节点,转交工单,发送邮箱
}
} }
...@@ -95,12 +95,10 @@ public class AutoSubmit extends IJobHandler { ...@@ -95,12 +95,10 @@ public class AutoSubmit extends IJobHandler {
changeRecord.setFlowNode(execNode); changeRecord.setFlowNode(execNode);
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeFlowService.updateRecord(changeRecord); changeFlowService.updateRecord(changeRecord);
// todo: 发送邮件
} catch (Exception e) { } catch (Exception e) {
log.debug("[progressRecord] submit error, flowId{}", flowId); log.debug("[progressRecord] submit error, flowId{}", flowId);
} }
} else if (ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId().equals(flowNode)) {
// todo: 发送邮件
} }
// todo: 到达执行确认时间,发送邮件
} }
} }
\ No newline at end of file
...@@ -126,8 +126,8 @@ public class ChangeFlowController { ...@@ -126,8 +126,8 @@ public class ChangeFlowController {
* @return * @return
*/ */
@PostMapping("/deliver") @PostMapping("/deliver")
public AjaxResult<Boolean> deliver() { public AjaxResult<Void> deliver() {
changeFlowBiz.deliver();
return AjaxResult.success(); return AjaxResult.success();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment