From cf8d538cfeb325a925ec82bbce83e1f86c3d7218 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Wed, 5 Aug 2026 15:28:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(fixcontact):=20=E5=AE=9A=E7=82=B9=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E5=8D=95=E5=AE=9E=E4=BD=93=E6=95=8F=E6=84=9F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0=20@AutoLogIgnore=20=E8=84=B1?= =?UTF-8?q?=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主表标注定点联系所领导/相关分管所领导/申请人/所办领导ID/部门审批信息, 子表标注反馈人及反馈人姓名,写操作日志时自动脱敏为 ***。 --- .../modules/bg/fixcontact/entity/FixedContact20260730.java | 6 ++++++ .../bg/fixcontact/entity/FixedContactFeedback20260730.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java index 91795de..2777e73 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java @@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.AutoLogIgnore; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; @@ -62,6 +63,7 @@ public class FixedContact20260730 implements Serializable { @Excel(name = "定点联系所领导", width = 15) @ExcelColumn(name = "定点联系所领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + @AutoLogIgnore @Schema(description = "定点联系所领导") private java.lang.String contactLeader; @@ -101,12 +103,14 @@ public class FixedContact20260730 implements Serializable { @Excel(name = "相关分管所领导", width = 15) @ExcelColumn(name = "相关分管所领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + @AutoLogIgnore @Schema(description = "相关分管所领导") private java.lang.String relatedLeader; @Excel(name = "申请人", width = 15) @ExcelColumn(name = "申请人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + @AutoLogIgnore @Schema(description = "申请人") private java.lang.String applicant; @@ -133,9 +137,11 @@ public class FixedContact20260730 implements Serializable { @Schema(description = "是否所办领导审批:0=否,1=是") private java.lang.String isNeedAppro; + @AutoLogIgnore @Schema(description = "所办领导ID,多个逗号分隔") private java.lang.String supDeptleaderid; + @AutoLogIgnore @TableField(typeHandler = JacksonTypeHandler.class) @Schema(description = "部门审批信息Map(按部门ID存是否办结与部门经办人)") private DeptApproveDetailMap approveInfo; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java index f830aa7..682ac5a 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; +import org.jeecg.common.aspect.annotation.AutoLogIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -70,12 +71,14 @@ public class FixedContactFeedback20260730 implements Serializable { @Schema(description = "实际完成情况") private java.lang.String actualFinishStatus; + @AutoLogIgnore @Schema(description = "反馈人") private java.lang.String feedbackUser; @Schema(description = "反馈部门") private java.lang.String feedbackDept; + @AutoLogIgnore @TableField(exist = false) @Schema(description = "反馈人姓名") private java.lang.String feedbackUserName;