新增待办信息
This commit is contained in:
@@ -65,7 +65,7 @@ public class BizListItem extends DataEntity<BizListItem> implements Serializable
|
||||
private String avatar; // 头像图标
|
||||
private String title; // 通知标题
|
||||
private String titleDelete; // 是否删除
|
||||
private String datetime; // 发送时间
|
||||
private Date datetime; // 发送时间
|
||||
private String type; // 类型标识
|
||||
private String readFlag; // 是否已读
|
||||
private String description; // 描述信息
|
||||
@@ -105,6 +105,21 @@ public class BizListItem extends DataEntity<BizListItem> implements Serializable
|
||||
super(id);
|
||||
}
|
||||
|
||||
public BizListItem(String title, Date datetime, String description, String loginUser, String userName, String createUser) {
|
||||
this.createTime = new Date();
|
||||
this.title = title;
|
||||
this.titleDelete = "0";
|
||||
this.datetime = datetime;
|
||||
this.type = "2";
|
||||
this.readFlag = "0";
|
||||
this.description = description;
|
||||
this.clickClose = "0";
|
||||
this.ustatus = "1";
|
||||
this.loginUser = loginUser;
|
||||
this.userName = userName;
|
||||
this.createUser = createUser;
|
||||
}
|
||||
|
||||
public Date getCreateTime_gte() {
|
||||
return sqlMap.getWhere().getValue("create_time", QueryType.GTE);
|
||||
}
|
||||
|
||||
@@ -2,9 +2,12 @@ package com.jeesite.modules.biz.web;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.jeesite.modules.app.service.MsgService;
|
||||
import com.jeesite.modules.app.utils.vDate;
|
||||
import com.jeesite.modules.biz.entity.BizCalendarFlow;
|
||||
import com.jeesite.modules.biz.entity.BizListItem;
|
||||
import com.jeesite.modules.biz.service.BizCalendarFlowService;
|
||||
import com.jeesite.modules.biz.service.BizListItemService;
|
||||
import com.jeesite.modules.sys.entity.User;
|
||||
import com.jeesite.modules.sys.utils.DictUtils;
|
||||
import com.jeesite.modules.sys.utils.UserUtils;
|
||||
@@ -46,8 +49,13 @@ public class BizCalendarScheduleController extends BaseController {
|
||||
@Resource
|
||||
private BizCalendarFlowService flowService;
|
||||
|
||||
|
||||
@Resource
|
||||
private MsgService msgService;
|
||||
|
||||
private final BizCalendarScheduleService bizCalendarScheduleService;
|
||||
|
||||
|
||||
public BizCalendarScheduleController(BizCalendarScheduleService bizCalendarScheduleService) {
|
||||
this.bizCalendarScheduleService = bizCalendarScheduleService;
|
||||
}
|
||||
@@ -104,6 +112,7 @@ public class BizCalendarScheduleController extends BaseController {
|
||||
if (!bizCalendarSchedule.getIsNewRecord()) {
|
||||
getScheduleFlow(bizCalendarSchedule, user);
|
||||
}
|
||||
msgService.addSchedule(bizCalendarSchedule);
|
||||
bizCalendarSchedule.setCreatorUser(user.getLoginCode());
|
||||
bizCalendarSchedule.setParticipantName(fUser.getUserName());
|
||||
bizCalendarScheduleService.save(bizCalendarSchedule);
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
package com.jeesite.modules.biz.web;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.jeesite.modules.app.dao.TabItem;
|
||||
@@ -188,6 +185,7 @@ public class BizListItemController extends BaseController {
|
||||
@ResponseBody
|
||||
public List<TabItem> getTabListData() {
|
||||
User user = UserUtils.getUser();
|
||||
Set<String> targetCodes = new HashSet<>(Arrays.asList("2", "3"));
|
||||
return Arrays.stream(NotifyType.values())
|
||||
.map(type -> {
|
||||
BizListItem listItem = new BizListItem();
|
||||
@@ -196,7 +194,7 @@ public class BizListItemController extends BaseController {
|
||||
listItem.setUstatus("1");
|
||||
listItem.setType(type.getCode());
|
||||
listItem.setDateTime_gte(new Date());
|
||||
if (type.getCode().equals("3")) {
|
||||
if (targetCodes.contains(type.getCode())) {
|
||||
listItem.setLoginUser(user.getLoginCode());
|
||||
}
|
||||
List<BizListItem> dataList = bizListItemService.findList(listItem);
|
||||
|
||||
Reference in New Issue
Block a user