新增待办信息
This commit is contained in:
@@ -23,9 +23,9 @@ public class MyUtils {
|
|||||||
|
|
||||||
public static Map<String, Object> convertToTreeNode(BizFolders folder, boolean isDisabled) {
|
public static Map<String, Object> convertToTreeNode(BizFolders folder, boolean isDisabled) {
|
||||||
Map<String, Object> node = new HashMap<>();
|
Map<String, Object> node = new HashMap<>();
|
||||||
node.put("id", folder.getFolderId()); // folderId → id
|
node.put("id", folder.getFolderId());
|
||||||
node.put("name", folder.getFolderName()); // folderName → name
|
node.put("name", folder.getFolderName());
|
||||||
node.put("children", new ArrayList<>()); // 初始化children空数组
|
node.put("children", new ArrayList<>());
|
||||||
if (isDisabled) {
|
if (isDisabled) {
|
||||||
node.put("disabled", true);
|
node.put("disabled", true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.jeesite.modules.biz.entity;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import com.jeesite.common.mybatis.annotation.JoinTable;
|
import com.jeesite.common.mybatis.annotation.JoinTable;
|
||||||
import com.jeesite.common.mybatis.annotation.JoinTable.Type;
|
import com.jeesite.common.mybatis.annotation.JoinTable.Type;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
@@ -23,21 +24,22 @@ import java.io.Serial;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件夹信息Entity
|
* 文件夹信息Entity
|
||||||
|
*
|
||||||
* @author gaoxq
|
* @author gaoxq
|
||||||
* @version 2025-12-18
|
* @version 2025-12-18
|
||||||
*/
|
*/
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@Table(name="biz_folders", alias="a", label="文件夹信息信息", columns={
|
@Table(name = "biz_folders", alias = "a", label = "文件夹信息信息", columns = {
|
||||||
@Column(name="create_time", attrName="createTime", label="记录时间", isUpdate=false, isUpdateForce=true),
|
@Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdate = false, isUpdateForce = true),
|
||||||
@Column(name="folder_id", attrName="folderId", label="文件夹标识", isPK=true),
|
@Column(name = "folder_id", attrName = "folderId", label = "文件夹标识", isPK = true),
|
||||||
@Column(name="folder_name", attrName="folderName", label="文件夹名称", queryType=QueryType.LIKE),
|
@Column(name = "folder_name", attrName = "folderName", label = "文件夹名称", queryType = QueryType.LIKE),
|
||||||
@Column(name="parent_id", attrName="parentId", label="父文件夹"),
|
@Column(name = "parent_id", attrName = "parentId", label = "父文件夹"),
|
||||||
@Column(name="user_name", attrName="userName", label="用户姓名", isQuery=false),
|
@Column(name = "user_name", attrName = "userName", label = "用户姓名", isQuery = false),
|
||||||
@Column(name="login_code", attrName="loginCode", label="用户名称"),
|
@Column(name = "login_code", attrName = "loginCode", label = "用户名称"),
|
||||||
@Column(name="update_time", attrName="updateTime", label="更新时间", isQuery=false, isUpdateForce=true),
|
@Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true),
|
||||||
@Column(name="is_deleted", attrName="isDeleted", label="是否删除"),
|
@Column(name = "is_deleted", attrName = "isDeleted", label = "是否删除"),
|
||||||
@Column(name="description", attrName="description", label="文件夹描述", queryType=QueryType.LIKE),
|
@Column(name = "description", attrName = "description", label = "文件夹描述", isQuery = false),
|
||||||
}, orderBy="a.create_time DESC"
|
}, orderBy = "a.create_time DESC"
|
||||||
)
|
)
|
||||||
@Data
|
@Data
|
||||||
public class BizFolders extends DataEntity<BizFolders> implements Serializable {
|
public class BizFolders extends DataEntity<BizFolders> implements Serializable {
|
||||||
@@ -55,21 +57,21 @@ public class BizFolders extends DataEntity<BizFolders> implements Serializable {
|
|||||||
private String description; // 文件夹描述
|
private String description; // 文件夹描述
|
||||||
|
|
||||||
@ExcelFields({
|
@ExcelFields({
|
||||||
@ExcelField(title="记录时间", attrName="createTime", align=Align.CENTER, sort=10, dataFormat="yyyy-MM-dd hh:mm"),
|
@ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"),
|
||||||
@ExcelField(title="文件夹标识", attrName="folderId", align=Align.CENTER, sort=20),
|
@ExcelField(title = "文件夹标识", attrName = "folderId", align = Align.CENTER, sort = 20),
|
||||||
@ExcelField(title="文件夹名称", attrName="folderName", align=Align.CENTER, sort=30),
|
@ExcelField(title = "文件夹名称", attrName = "folderName", align = Align.CENTER, sort = 30),
|
||||||
@ExcelField(title="父文件夹", attrName="parentId", align=Align.CENTER, sort=40),
|
@ExcelField(title = "父文件夹", attrName = "parentId", align = Align.CENTER, sort = 40),
|
||||||
@ExcelField(title="用户姓名", attrName="userName", align=Align.CENTER, sort=50),
|
@ExcelField(title = "用户姓名", attrName = "userName", align = Align.CENTER, sort = 50),
|
||||||
@ExcelField(title="用户名称", attrName="loginCode", align=Align.CENTER, sort=60),
|
@ExcelField(title = "用户名称", attrName = "loginCode", align = Align.CENTER, sort = 60),
|
||||||
@ExcelField(title="更新时间", attrName="updateTime", align=Align.CENTER, sort=70, dataFormat="yyyy-MM-dd hh:mm"),
|
@ExcelField(title = "更新时间", attrName = "updateTime", align = Align.CENTER, sort = 70, dataFormat = "yyyy-MM-dd hh:mm"),
|
||||||
@ExcelField(title="是否删除", attrName="isDeleted", dictType="sys_yes_no", align=Align.CENTER, sort=80),
|
@ExcelField(title = "是否删除", attrName = "isDeleted", dictType = "sys_yes_no", align = Align.CENTER, sort = 80),
|
||||||
@ExcelField(title="文件夹描述", attrName="description", align=Align.CENTER, sort=90),
|
@ExcelField(title = "文件夹描述", attrName = "description", align = Align.CENTER, sort = 90),
|
||||||
})
|
})
|
||||||
public BizFolders() {
|
public BizFolders() {
|
||||||
this(null);
|
this(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public BizFolders(String id){
|
public BizFolders(String id) {
|
||||||
super(id);
|
super(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -239,6 +239,17 @@ public class BizFoldersController extends BaseController {
|
|||||||
List<Map<String, Object>> thirdNodeList = new ArrayList<>();
|
List<Map<String, Object>> thirdNodeList = new ArrayList<>();
|
||||||
for (BizFolders thirdFolder : thirdLevelFolders) {
|
for (BizFolders thirdFolder : thirdLevelFolders) {
|
||||||
Map<String, Object> thirdNode = MyUtils.convertToTreeNode(thirdFolder, false);
|
Map<String, Object> thirdNode = MyUtils.convertToTreeNode(thirdFolder, false);
|
||||||
|
BizFolders fourthQuery = new BizFolders();
|
||||||
|
fourthQuery.setParentId(thirdFolder.getFolderId());
|
||||||
|
fourthQuery.setIsDeleted(0);
|
||||||
|
List<BizFolders> fourthLevelFolders = bizFoldersService.findList(fourthQuery);
|
||||||
|
List<Map<String, Object>> fourthNodeList = new ArrayList<>();
|
||||||
|
for (BizFolders fourthFolder : fourthLevelFolders) {
|
||||||
|
Map<String, Object> fourthNode = MyUtils.convertToTreeNode(fourthFolder, bizFolders.getDescription().equals("add") ? true : false);
|
||||||
|
fourthNode.put("children", new ArrayList<>());
|
||||||
|
fourthNodeList.add(fourthNode);
|
||||||
|
}
|
||||||
|
thirdNode.put("children", fourthNodeList);
|
||||||
thirdNodeList.add(thirdNode);
|
thirdNodeList.add(thirdNode);
|
||||||
}
|
}
|
||||||
secondNode.put("children", thirdNodeList);
|
secondNode.put("children", thirdNodeList);
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
component: 'TreeSelect',
|
component: 'TreeSelect',
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: bizFolderTreeData,
|
api: bizFolderTreeData,
|
||||||
params: { loginCode: userinfo.value.loginCode },
|
params: { loginCode: userinfo.value.loginCode , description: 'add' },
|
||||||
allowClear: true,
|
allowClear: true,
|
||||||
},
|
},
|
||||||
required: true,
|
required: true,
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
component: 'TreeSelect',
|
component: 'TreeSelect',
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: bizFolderTreeData,
|
api: bizFolderTreeData,
|
||||||
params: { loginCode: userinfo.value.loginCode },
|
params: { loginCode: userinfo.value.loginCode, description: 'mv' },
|
||||||
allowClear: true,
|
allowClear: true,
|
||||||
},
|
},
|
||||||
required: true,
|
required: true,
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
component: 'Select',
|
component: 'Select',
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: bizFoldersListAll,
|
api: bizFoldersListAll,
|
||||||
|
params: {},
|
||||||
fieldNames: { label: 'folderName', value: 'folderId' },
|
fieldNames: { label: 'folderName', value: 'folderId' },
|
||||||
immediate: true,
|
immediate: true,
|
||||||
allowClear: true,
|
allowClear: true,
|
||||||
|
|||||||
Reference in New Issue
Block a user