From cfcc0e016cbff08bcd1c3ba4514891f9e4051330 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 13 Aug 2026 15:10:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(dq):=20=E5=8F=8D=E9=A6=88=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A5=E9=BD=90=E8=BF=9B=E5=B1=95=E7=8A=B6=E6=80=81=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E4=B8=8E=E7=BA=AA=E6=A3=80=E5=8F=8D=E9=A6=88=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - bpmStatus 补 @Dict(feedback_status) 注解，修复进展状态列表不显示 - 新增检查情况/监督意见/措施数量字段及表结构增量脚本，修复纪检字段保存丢失 Co-Authored-By: Claude Opus 4.7 --- .../dqinspecttask/entity/DqInspectProgress.java | 14 ++++++++++++++ sql-changelog/README.md | 1 + ...0813_反馈表新增检查情况监督意见措施数量字段.sql | 9 +++++++++ 3 files changed, 24 insertions(+) create mode 100644 sql-changelog/ddl/20260813_反馈表新增检查情况监督意见措施数量字段.sql diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java index 6e75028..73f832a 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -78,8 +79,21 @@ public class DqInspectProgress implements Serializable { private java.lang.String workProgress; /**进展状态*/ @Excel(name = "进展状态", width = 15, dicCode = "feedback_status") + @Dict(dicCode = "feedback_status") @Schema(description = "进展状态") private java.lang.String bpmStatus; + /**检查情况*/ + @Excel(name = "检查情况", width = 15) + @Schema(description = "检查情况") + private java.lang.String inspectionStatus; + /**监督意见*/ + @Excel(name = "监督意见", width = 15) + @Schema(description = "监督意见") + private java.lang.String supervisoryOpinion; + /**措施数量*/ + @Excel(name = "措施数量", width = 15) + @Schema(description = "措施数量") + private java.lang.Integer measureCount; /**删除标识*/ @Excel(name = "删除标识", width = 15) @Schema(description = "删除标识") diff --git a/sql-changelog/README.md b/sql-changelog/README.md index 4ce69fa..c12c9ed 100644 --- a/sql-changelog/README.md +++ b/sql-changelog/README.md @@ -35,6 +35,7 @@ YYYYMMDD_描述.sql | 2026-08-12 | DML | `20260812_巡视整改提升流程完整流程更新.sql` | 巡视整改提升流程（process_1780563034974）完整流程更新，全新库可建、已有库可UPDATE | | 2026-08-12 | DML | `20260812_习讲话反馈流程完整流程更新.sql` | 习讲话经办人反馈流程（xispeak经办人反馈流程）完整流程更新（process_key含中文，需 -f 强制导出），全新库可建、已有库可UPDATE | | 2026-08-12 | DML | `20260812_习讲话审批流程完整流程更新.sql` | 习讲话审批流程（bg_xispeak_process）完整流程更新，全新库可建、已有库可UPDATE | +| 2026-08-13 | DDL | `20260813_反馈表新增检查情况监督意见措施数量字段.sql` | dq_inspect_progress 新增 inspection_status/supervisory_opinion/measure_count 三列，保存纪检反馈字段 | ## 使用方式 diff --git a/sql-changelog/ddl/20260813_反馈表新增检查情况监督意见措施数量字段.sql b/sql-changelog/ddl/20260813_反馈表新增检查情况监督意见措施数量字段.sql new file mode 100644 index 0000000..9b1d3aa --- /dev/null +++ b/sql-changelog/ddl/20260813_反馈表新增检查情况监督意见措施数量字段.sql @@ -0,0 +1,9 @@ +-- 反馈表 dq_inspect_progress 新增纪检反馈字段 +-- 背景：反馈弹窗（DqInspectTaskBPMFeedbackModal）在 showJiJianFields 时展示并提交 +-- 检查情况 / 监督意见 / 措施数量 三个字段，但子表实体与表结构均缺失这三列， +-- 导致保存时被 MyBatis-Plus 丢弃。列类型对齐主表 dq_inspect_task。 +-- 变更日期：2026-08-13 +ALTER TABLE `dq_inspect_progress` + ADD COLUMN `inspection_status` varchar(1000) NULL DEFAULT NULL COMMENT '检查情况' AFTER `bpm_status`, + ADD COLUMN `supervisory_opinion` varchar(1000) NULL DEFAULT NULL COMMENT '监督意见' AFTER `inspection_status`, + ADD COLUMN `measure_count` int NULL DEFAULT NULL COMMENT '措施数量' AFTER `supervisory_opinion`;