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 { +}