diff --git a/web-api/src/main/java/com/jeesite/modules/app/service/MsgService.java b/web-api/src/main/java/com/jeesite/modules/app/service/MsgService.java index 25205e97..4a5cb7df 100644 --- a/web-api/src/main/java/com/jeesite/modules/app/service/MsgService.java +++ b/web-api/src/main/java/com/jeesite/modules/app/service/MsgService.java @@ -10,6 +10,8 @@ import com.jeesite.modules.sys.utils.UserUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class MsgService { @@ -26,8 +28,24 @@ public class MsgService { User user = UserUtils.getUser(); User fUser = UserUtils.getByLoginCode(bizCalendarSchedule.getParticipantUser()); String title = MyUtils.concatParams("您有一条:[", bizCalendarSchedule.getTitle(), "]日程消息,请及时处理."); - BizListItem listItem = new BizListItem(title, bizCalendarSchedule.getEndTime(), bizCalendarSchedule.getContent(), fUser.getLoginCode(), fUser.getUserName(), user.getLoginCode()); - listItem.setAvatar(HTTP_URL + user.getAvatar()); - bizListItemService.save(listItem); + if (bizCalendarSchedule.getIsNewRecord()) { + BizListItem listItem = new BizListItem(title, bizCalendarSchedule.getEndTime(), bizCalendarSchedule.getContent(), fUser.getLoginCode(), fUser.getUserName(), user.getLoginCode()); + listItem.setAvatar(HTTP_URL + user.getAvatar()); + listItem.setBizCode(bizCalendarSchedule.getScheduleNo()); + bizListItemService.save(listItem); + } else { + BizListItem item = new BizListItem(); + item.setBizCode(bizCalendarSchedule.getScheduleNo()); + List listItem = bizListItemService.findList(item); + if (listItem.size() > 0) { + BizListItem bizListItem = listItem.get(0); + bizListItem.setTitle(title); + bizListItem.setDatetime(bizCalendarSchedule.getEndTime()); + bizListItem.setDescription(bizCalendarSchedule.getContent()); + bizListItem.setLoginUser(fUser.getLoginCode()); + bizListItem.setUserName(fUser.getUserName()); + bizListItemService.save(bizListItem); + } + } } } diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java index 32f69a43..9e62fd60 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java @@ -47,6 +47,7 @@ import java.io.Serial; @Column(name = "color", attrName = "color", label = "颜色值", isQuery = false), @Column(name = "ustatus", attrName = "ustatus", label = "发布状态"), @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false), + @Column(name = "biz_code", attrName = "bizCode", label = "业务编号", isUpdate = false, isUpdateForce = true), @Column(name = "login_user", attrName = "loginUser", label = "接收用户"), @Column(name = "user_name", attrName = "userName", label = "接收用户"), @Column(name = "create_user", attrName = "createUser", label = "创建用户", isUpdate = false, isUpdateForce = true), @@ -75,6 +76,7 @@ public class BizListItem extends DataEntity implements Serializable private String color; // 颜色值 private String ustatus; private Date updateTime; // 更新时间 + private String bizCode; private String loginUser; private String userName; private String createUser;