From e3be62749de4585cbfe8dd63890ad6b9f4e45342 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@侵权。> Date: Fri, 22 May 2026 16:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Exispeak=E5=86=85=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E7=B1=BB=EF=BC=8C=E6=96=B0=E5=A2=9EDeptApproveDetailM?= =?UTF-8?q?ap=E8=A7=A3=E5=86=B3json=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=E6=97=B6=E6=B3=9B=E5=9E=8B=E6=93=A6=E9=99=A4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8Cxispeak=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AF=86=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bg/xispeak/constant/XiSpeakConstant.java | 18 ++++++++++++++++++ .../modules/bg/xispeak/entity/BgXiSpeak.java | 7 ++++++- .../bg/xispeak/entity/BgXiSpeakFeedback.java | 2 +- .../bg/xispeak/entity/DeptApproveDetail.java | 8 ++++++-- .../xispeak/entity/DeptApproveDetailMap.java | 6 ++++++ 5 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java create mode 100644 jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java new file mode 100644 index 0000000..c45279e --- /dev/null +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.bg.xispeak.constant; + +/** + * 语音/演讲模块常量类 + */ +public final class XiSpeakConstant { + + // 1. 私有化构造器，不允许外部 new 实例化 + private XiSpeakConstant() { + throw new UnsupportedOperationException("This is a constant class and cannot be instantiated"); + } + + // 3. 建议：使用内部类进行“业务分组” + public static final class CompletionStatus { + public static final int FINISHED = 1; // 已完成 + public static final int UN_FINISHED = 0; // 未完成 + } +} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java index 353f8ab..e8a4b0a 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java @@ -82,6 +82,11 @@ public class BgXiSpeak implements Serializable { @Excel(name = "学习传达研究部署情况", width = 15) @Schema(description = "学习传达研究部署情况") private java.lang.String status; + /**密级*/ + @Excel(name = "密级", width = 15) + @Dict(dicCode = "secret_level") + @Schema(description = "密级") + private java.lang.String secretLevel; /**责任人*/ @Excel(name = "责任人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") @@ -174,7 +179,7 @@ public class BgXiSpeak implements Serializable { private java.util.Date deadline; @TableField(typeHandler = JacksonTypeHandler.class) - private Map approveInfo; + private DeptApproveDetailMap approveInfo; /**督办次数*/ @Excel(name = "发起类型", width = 15) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java index 55b3b6d..4e1ff2b 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java @@ -161,6 +161,6 @@ public class BgXiSpeakFeedback implements Serializable { /**审批信息Map*/ @TableField(typeHandler = JacksonTypeHandler.class) - private Map approveInfo; + private DeptApproveDetailMap approveInfo; } \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java index 217ba1d..1516e20 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java @@ -1,17 +1,21 @@ package org.jeecg.modules.bg.xispeak.entity; +import com.fasterxml.jackson.annotation.JsonAlias; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; + @Data -@NoArgsConstructor // 必须确保有这个 +@NoArgsConstructor @AllArgsConstructor public class DeptApproveDetail { private String deptId; // 部门ID private String approverId; // 审批人ID（从监听器获取的） private String approverName; // 审批人姓名（可选） + @JsonAlias("implUserId") private List implUserIdList; // 落实人Id + @JsonAlias("implUserName") private List implUserNameList; // 落实人姓名 -} \ No newline at end of file +} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java new file mode 100644 index 0000000..8448794 --- /dev/null +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java @@ -0,0 +1,6 @@ +package org.jeecg.modules.bg.xispeak.entity; + +import java.util.LinkedHashMap; + +public class DeptApproveDetailMap extends LinkedHashMap { +}