From 00aaf8f54a647a2c15830f46eadf8e55261a0ce0 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Fri, 12 Dec 2025 17:26:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AFvue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/biz/entity/BizCalendarFlow.java | 2 +- .../web/BizCalendarScheduleController.java | 28 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizCalendarFlow.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizCalendarFlow.java index 96c79fa3..1536e69a 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizCalendarFlow.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizCalendarFlow.java @@ -47,7 +47,7 @@ public class BizCalendarFlow extends DataEntity implements Seri private String operationUser; // 操作人 private String operationType; // 操作类型 private String statusName; // 操作状态 - private String flowContent; + private String flowContent; //更新内容 public BizCalendarFlow() { this(null); diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizCalendarScheduleController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizCalendarScheduleController.java index 87a00a28..4678b190 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizCalendarScheduleController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizCalendarScheduleController.java @@ -99,19 +99,14 @@ public class BizCalendarScheduleController extends BaseController { @PostMapping(value = "save") @ResponseBody public String save(@Validated BizCalendarSchedule bizCalendarSchedule) { - boolean isReachable = bizCalendarSchedule.getIsNewRecord(); User user = UserUtils.getUser(); User fUser = UserUtils.getByLoginCode(bizCalendarSchedule.getParticipantUser()); - BizCalendarFlow calendarFlow = new BizCalendarFlow(); - calendarFlow.setScheduleId(bizCalendarSchedule.getScheduleId()); - calendarFlow.setOperationType(isReachable ? "新增" : "变更"); - calendarFlow.setOperationUser(user.getUserName()); - calendarFlow.setFlowContent(bizCalendarSchedule.getContent()); - calendarFlow.setStatusName(DictUtils.getDictLabel("todo_status", bizCalendarSchedule.getUstatus(), "0")); + if (!bizCalendarSchedule.getIsNewRecord()) { + getScheduleFlow(bizCalendarSchedule, user); + } bizCalendarSchedule.setCreatorUser(user.getLoginCode()); bizCalendarSchedule.setParticipantName(fUser.getUserName()); bizCalendarSchedule.setUpdateTime(vDate.getUpdateTime(bizCalendarSchedule.getIsNewRecord())); - flowService.save(calendarFlow); bizCalendarScheduleService.save(bizCalendarSchedule); return renderResult(Global.TRUE, text("保存日程信息成功!")); } @@ -169,4 +164,21 @@ public class BizCalendarScheduleController extends BaseController { return renderResult(Global.TRUE, text("删除日程信息成功!")); } + + /** + * 流程新增 + */ + private void getScheduleFlow(BizCalendarSchedule bizCalendarSchedule, User user) { + BizCalendarSchedule schedule = bizCalendarScheduleService.get(bizCalendarSchedule.getScheduleId()); + if (!schedule.getParticipantUser().equals(bizCalendarSchedule.getParticipantUser())) { + BizCalendarFlow calendarFlow = new BizCalendarFlow(); + calendarFlow.setOperationUser(user.getUserName()); + calendarFlow.setFlowContent(bizCalendarSchedule.getContent()); + calendarFlow.setScheduleId(bizCalendarSchedule.getScheduleId()); + calendarFlow.setOperationType("变更通知人-->" + bizCalendarSchedule.getParticipantName()); + calendarFlow.setStatusName(DictUtils.getDictLabel("todo_status", bizCalendarSchedule.getUstatus(), "0")); + flowService.save(calendarFlow); + } + } + } \ No newline at end of file