manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增待办信息

Browse Source
This commit is contained in:
gaoxq
2025-12-16 22:22:58 +08:00
parent e5b6f7a2a6
commit 5884a3125c
23 changed files with 374 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web-api/src/main/java/com/jeesite/modules/biz/entity/BizCalendarFlow.java
View File

@@ -34,7 +34,7 @@ import java.io.Serial;
@Column(name = "operation_type", attrName = "operationType", label = "操作类型", isQuery = false),
@Column(name = "status_name", attrName = "statusName", label = "操作状态", isQuery = false),
@Column(name = "flow_content", attrName = "flowContent", label = "流程内容", isQuery = false),
}, orderBy = "a.calendar_flow_id DESC"
}, orderBy = "a.create_time DESC"
)
@Data
public class BizCalendarFlow extends DataEntity<BizCalendarFlow> implements Serializable {

25
web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java
View File

@@ -37,12 +37,13 @@ import java.io.Serial;
@Column(name = "avatar", attrName = "avatar", label = "头像图标", isUpdate = false, isUpdateForce = true),
@Column(name = "title", attrName = "title", label = "通知标题", queryType = QueryType.LIKE),
@Column(name = "title_delete", attrName = "titleDelete", label = "是否删除"),
@Column(name = "datetime", attrName = "datetime", label = "发送时间", isQuery = false),
@Column(name = "datetime", attrName = "datetime", label = "发送时间"),
@Column(name = "type", attrName = "type", label = "类型标识"),
@Column(name = "read_flag", attrName = "readFlag", label = "是否已读"),
@Column(name = "description", attrName = "description", label = "描述信息", isQuery = false),
@Column(name = "click_close", attrName = "clickClose", label = "是否关闭"),
@Column(name = "extra", attrName = "extra", label = "待办状态"),
@Column(name = "extra_desc", attrName = "extraDesc", label = "待办意见"),
@Column(name = "color", attrName = "color", label = "颜色值", isQuery = false),
@Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false),
@Column(name = "login_user", attrName = "loginUser", label = "接收用户"),
@@ -69,6 +70,7 @@ public class BizListItem extends DataEntity<BizListItem> implements Serializable
private String description; // 描述信息
private String clickClose; // 是否关闭
private String extra; // 待办状态
private String extraDesc; //待办意见
private String color; // 颜色值
private Date updateTime; // 更新时间
private String loginUser;
@@ -82,15 +84,15 @@ public class BizListItem extends DataEntity<BizListItem> implements Serializable
@ExcelFields({
@ExcelField(title = "创建时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "唯一标识", attrName = "id", align = Align.CENTER, sort = 20),
@ExcelField(title = "头像图标", attrName = "avatar", align = Align.CENTER, sort = 30),
@ExcelField(title = "通知标题", attrName = "title", align = Align.CENTER, sort = 40),
@ExcelField(title = "是否删除", attrName = "titleDelete", align = Align.CENTER, sort = 50),
@ExcelField(title = "发送时间", attrName = "datetime", align = Align.CENTER, sort = 60, dataFormat = "yyyy-MM-dd"),
@ExcelField(title = "类型标识", attrName = "type", align = Align.CENTER, sort = 70),
@ExcelField(title = "是否已读", attrName = "readFlag", align = Align.CENTER, sort = 80),
@ExcelField(title = "是否删除", attrName = "titleDelete", dictType = "is_open", align = Align.CENTER, sort = 50),
@ExcelField(title = "到期时间", attrName = "datetime", align = Align.CENTER, sort = 60, dataFormat = "yyyy-MM-dd"),
@ExcelField(title = "所属类型", attrName = "type", dictType = "msg_type", align = Align.CENTER, sort = 70),
@ExcelField(title = "是否已读", attrName = "readFlag", dictType = "is_open", align = Align.CENTER, sort = 80),
@ExcelField(title = "描述信息", attrName = "description", align = Align.CENTER, sort = 90),
@ExcelField(title = "是否关闭", attrName = "clickClose", align = Align.CENTER, sort = 100),
@ExcelField(title = "是否关闭", attrName = "clickClose", dictType = "is_open", align = Align.CENTER, sort = 100),
@ExcelField(title = "待办状态", attrName = "extra", align = Align.CENTER, sort = 110),
@ExcelField(title = "待办意见", attrName = "extraDesc", align = Align.CENTER, sort = 120),
})
public BizListItem() {
this(null);
@@ -116,4 +118,13 @@ public class BizListItem extends DataEntity<BizListItem> implements Serializable
sqlMap.getWhere().and("create_time", QueryType.LTE, createTime);
}
public Date getDateTime_gte() {
return sqlMap.getWhere().getValue("datetime", QueryType.GTE);
}
public void setDateTime_gte(Date createTime) {
sqlMap.getWhere().and("datetime", QueryType.GTE, createTime);
}
}

2
web-api/src/main/java/com/jeesite/modules/biz/entity/BizMailReceived.java
View File

@@ -52,7 +52,7 @@ import java.io.Serial;
columns = {
@Column(name = "account_name", attrName = "accountName", label = "配置名称"),
}),
}, orderBy = "a.id DESC"
}, orderBy = "a.create_time DESC"
)
@Data
public class BizMailReceived extends DataEntity<BizMailReceived> implements Serializable {

4
web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java
View File

@@ -1,6 +1,7 @@
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.stream.Collectors;
@@ -97,7 +98,7 @@ public class BizListItemController extends BaseController {
@ResponseBody
public String save(@Validated BizListItem bizListItem) {
User user = UserUtils.getUser();
if (bizListItem.getType().equals("3")){
if (bizListItem.getType().equals("3")) {
User loginUser = UserUtils.getByLoginCode(bizListItem.getLoginUser());
bizListItem.setUserName(loginUser.getUserName());
}
@@ -178,6 +179,7 @@ public class BizListItemController extends BaseController {
listItem.setClickClose("0");
listItem.setTitleDelete("0");
listItem.setType(type.getCode());
listItem.setDateTime_gte(new Date());
if (type.getCode().equals("3")) {
listItem.setLoginUser(user.getLoginCode());
}