From d22d229a3d6c5f6f2c1bf8638d197768517cc728 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Mon, 22 Jun 2026 14:42:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor(supervision):=20=E4=BC=98=E5=8C=96Exce?= =?UTF-8?q?l=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5,=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=86=85=E9=83=A8=E5=AD=97=E6=AE=B5=E5=B9=B6=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../modules/bg/xispeak/entity/BgXiSpeak.java | 22 +++++++++---------- .../dqinspecttask/entity/DqInspectTask.java | 8 +++---- .../entity/DjInspectImprove.java | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) 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 e7f2ede..a672fe2 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 @@ -56,11 +56,11 @@ public class BgXiSpeak implements Serializable { @Schema(description = "所属部门") private java.lang.String sysOrgCode; /**父级节点*/ - @Excel(name = "父级节点", width = 15) +// @Excel(name = "父级节点", width = 15) @Schema(description = "父级节点") private java.lang.String pid; /**是否有子节点*/ - @Excel(name = "是否有子节点", width = 15, dicCode = "yn") +// @Excel(name = "是否有子节点", width = 15, dicCode = "yn") @Dict(dicCode = "yn") @Schema(description = "是否有子节点") private java.lang.String hasChild; @@ -83,7 +83,7 @@ public class BgXiSpeak implements Serializable { @Schema(description = "学习传达研究部署情况") private java.lang.String status; /**密级*/ - @Excel(name = "密级", width = 15) + @Excel(name = "密级", width = 15, dicCode = "secret_level") @Dict(dicCode = "secret_level") @Schema(description = "密级") private java.lang.String secretLevel; @@ -126,7 +126,7 @@ public class BgXiSpeak implements Serializable { @Schema(description = "报告反馈情况") private java.lang.String reportFeedbackStatus; /**是否存在完成风险(0不存在，1存在)*/ - @Excel(name = "是否存在完成风险(0不存在，1存在)", width = 15) + @Excel(name = "是否存在完成风险(0不存在，1存在)", width = 15, dicCode = "true_or_flase") @Schema(description = "是否存在完成风险(0不存在，1存在)") private java.lang.Integer isCompletionRisk; /**拖期风险应对措施*/ @@ -134,17 +134,17 @@ public class BgXiSpeak implements Serializable { @Schema(description = "拖期风险应对措施") private java.lang.String delayRiskMitigation; /**完成状态(0推进中，1已完成)*/ - @Excel(name = "完成状态(0推进中，1已完成)", width = 15) + @Excel(name = "完成状态(0推进中，1已完成)", width = 15, dicCode = "db_status") @Schema(description = "完成状态(0推进中，1已完成)") @Dict( dicCode = "db_status") private java.lang.Integer completionStatus; /**落实部门id*/ - @Excel(name = "落实部门id", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @Excel(name = "落实部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Schema(description = "落实部门id") private java.lang.String implDept; /**层深(最顶层节点层深为0)*/ - @Excel(name = "层深(最顶层节点层深为0)", width = 15) + //@Excel(name = "层深(最顶层节点层深为0)", width = 15) @Schema(description = "层深(最顶层节点层深为0)") private java.lang.Integer treeDepth; /**同级数据排序号*/ @@ -157,7 +157,7 @@ public class BgXiSpeak implements Serializable { @TableLogic private java.lang.Integer delFlag; /**流程引擎状态字段*/ - @Excel(name = "流程引擎状态字段", width = 15) +// @Excel(name = "流程引擎状态字段", width = 15) @Schema(description = "流程引擎状态字段") private java.lang.Integer bpmStatus; /**督办次数*/ @@ -165,7 +165,7 @@ public class BgXiSpeak implements Serializable { @Schema(description = "督办次数") private java.lang.Integer supervisionCount; /**dw领导userId字段*/ - @Excel(name = "领导userId字段", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") + @Excel(name = "领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") @Schema(description = "领导userId字段") private java.lang.String sdwLeaderList; @@ -185,12 +185,12 @@ public class BgXiSpeak implements Serializable { private DeptApproveDetailMap approveInfo; /**督办次数*/ - @Excel(name = "发起类型", width = 15) +// @Excel(name = "发起类型", width = 15) @Schema(description = "0收集后直接发起，1收集后按照反馈时间周期性发起") private java.lang.Integer launchType; /**周期类型 1日 2周 3两周 4月 5季*/ - @Excel(name = "周期类型", width = 15) +// @Excel(name = "周期类型", width = 15) @Schema(description = "周期类型 1日 2周 3两周 4月 5季") private java.lang.Integer intervalType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java index 9bd525b..774ea3b 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java @@ -122,11 +122,11 @@ public class DqInspectTask implements Serializable { @Schema(description = "措施数量") private java.lang.Integer measureCount; /**流程实例ID*/ - @Excel(name = "流程实例ID", width = 15) + //@Excel(name = "流程实例ID", width = 15) @Schema(description = "流程实例ID") private java.lang.String bpmProcessId; /**流程状态*/ - @Excel(name = "流程状态", width = 15, dicCode = "super_status") + //@Excel(name = "流程状态", width = 15, dicCode = "super_status") @Dict(dicCode = "super_status") @Schema(description = "流程状态") private java.lang.String bpmStatus; @@ -139,11 +139,11 @@ public class DqInspectTask implements Serializable { @Schema(description = "督办次数") private java.lang.String superviseCount; /**排序*/ - @Excel(name = "排序", width = 15) + //@Excel(name = "排序", width = 15) @Schema(description = "排序") private java.lang.Integer sortNo; /**删除标识*/ - @Excel(name = "删除标识", width = 15) + //@Excel(name = "删除标识", width = 15) @Schema(description = "删除标识") @TableLogic private java.lang.String delFlag; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java index 29cfa0e..20c7928 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java @@ -54,11 +54,11 @@ public class DjInspectImprove implements Serializable { @Schema(description = "所属部门") private java.lang.String sysOrgCode; /**树形表单父id*/ - @Excel(name = "树形表单父id", width = 15) + // @Excel(name = "树形表单父id", width = 15) @Schema(description = "树形表单父id") private java.lang.String pid; /**是否有子节点*/ - @Excel(name = "是否有子节点", width = 15, dicCode = "yn") + // @Excel(name = "是否有子节点", width = 15, dicCode = "yn") @Dict(dicCode = "yn") @Schema(description = "是否有子节点") private java.lang.String hasChild;