From 233a7aaffc5f6b88fe3acfa7d7b448fb683eac2e Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Wed, 29 Jul 2026 16:50:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=94=B5=E7=AB=99?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/qgc_base/domain/SdEngInfoBH.java | 55 +++++++++++++++++++
 .../service/impl/SdEngInfoBHServiceImpl.java  | 29 ++++++++--
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java
index b1704513..cec92071 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java
@@ -244,6 +244,10 @@ public class SdEngInfoBH implements Serializable {
     @FieldChinese("工程类别")
     private Integer engtp;
 
+    /** 工程类别名称 */
+    @TableField(exist = false)
+    private String engtpName;
+
     /** 工程规模 */
     @FieldChinese("工程规模")
     private Integer prsc;
@@ -260,10 +264,18 @@ public class SdEngInfoBH implements Serializable {
     @FieldChinese("工程等别")
     private String prgr;
 
+    /** 工程等别名称 */
+    @TableField(exist = false)
+    private String prgrName;
+
     /** 电站-主要功能 */
     @FieldChinese("电站-主要功能")
     private String fn;
 
+    /** 电站-主要功能名称 */
+    @TableField(exist = false)
+    private String fnName;
+
     /** 地震基本烈度 */
     @FieldChinese("地震基本烈度")
     private String bsssin;
@@ -276,31 +288,58 @@ public class SdEngInfoBH implements Serializable {
     @FieldChinese("是否调节水库")
     private Integer adjustEng;
 
+    /** 是否调节水库名称 */
+    @TableField(exist = false)
+    private String adjustEngName;
+
     /** 有无拦河坝 */
     @TableField("ISHVBRRG")
     @FieldChinese("有无拦河坝")
     private String ishvrgrg;
 
+    /** 有无拦河坝名称 */
+    @TableField(exist = false)
+    private String ishvrgrgName;
+
     /** 水库调节性能 */
     @FieldChinese("水库调节性能")
     private String rgcp;
 
+    @TableField(exist = false)
+    private String rgcpName;
+
     /** 坝体材质 */
     @FieldChinese("坝体材质")
     private Integer dmat;
 
+    /** 坝体材质名称 */
+    @TableField(exist = false)
+    private String dmatName;
+
     /** 坝体类型 */
     @FieldChinese("坝体类型")
     private String dmtp;
 
+    /** 坝体类型名称 */
+    @TableField(exist = false)
+    private String dmtpName;
+
     /** 开发方式 */
     @FieldChinese("开发方式")
     private String dvtp;
 
+    /** 开发方式名称 */
+    @TableField(exist = false)
+    private String dvtpName;
+
     /** 建设类型 */
     @FieldChinese("建设类型")
     private String cntp;
 
+    /** 建设类型名称 */
+    @TableField(exist = false)
+    private String cntpName;
+
     /** 管理单位 */
     @FieldChinese("管理单位")
     private String mnun;
@@ -313,6 +352,10 @@ public class SdEngInfoBH implements Serializable {
     @FieldChinese("归属部门")
     private String blsys;
 
+    /** 归属部门名称 */
+    @TableField(exist = false)
+    private String blsysName;
+
     /** 绕经度方向旋转矩阵值 */
     @FieldChinese("绕经度方向旋转矩阵值")
     private Double roll;
@@ -333,6 +376,10 @@ public class SdEngInfoBH implements Serializable {
     @FieldChinese("是否受下游顶托")
     private String impdstrz;
 
+    /** 是否受下游顶托名称 */
+    @TableField(exist = false)
+    private String impdstrzName;
+
     /** 工程概况 */
     @FieldChinese("工程概况")
     private String prov;
@@ -851,6 +898,10 @@ public class SdEngInfoBH implements Serializable {
     @FieldChinese("航道级别")
     private String chngrd;
 
+    /** 渠道级别名称 */
+    @TableField(exist = false)
+    private String chngrdName;
+
     /** 渠化航道里程 */
     @FieldChinese("渠化航道里程")
     private Double chnlnth;
@@ -988,6 +1039,10 @@ public class SdEngInfoBH implements Serializable {
     @FieldChinese("是否主要流域电站")
     private Integer chiefbasineng;
 
+    /** 是否主要流域电站名称 */
+    @TableField(exist = false)
+    private String chiefbasinengName;
+
     /** 蓄水开始时间 */
     @FieldChinese("蓄水开始时间")
     private String swsdt;
diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
index 805891fd..1b275306 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
@@ -102,6 +102,21 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
         CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("warnState").modifyProperty("warnStateName").dictType("STATIC").dictSource("WARN_STATE").build());
         CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("coenvwState").modifyProperty("coenvwStateName").dictType("STATIC").dictSource("COENVW_STATE").build());
         CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("scrsc").modifyProperty("scrscStateName").dictType("STATIC").dictSource("SCRSC").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("adjustEng").modifyProperty("adjustEngName").dictType("STATIC").dictSource("TY_SF").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("chiefbasineng").modifyProperty("chiefbasinengName").dictType("STATIC").dictSource("TY_SF").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("impdstrz").modifyProperty("impdstrzName").dictType("STATIC").dictSource("TY_SF").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("ishvbrrg").modifyProperty("ishvbrrgName").dictType("STATIC").dictSource("YW_TY").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dvtp").modifyProperty("dvtpName").dictType("STATIC").dictSource("DVTP").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("blsys").modifyProperty("blsysName").dictType("STATIC").dictSource("BLSYS").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("chngrd").modifyProperty("chngrdName").dictType("STATIC").dictSource("CHNGRD").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("cntp").modifyProperty("cntpName").dictType("STATIC").dictSource("CNTP").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dmat").modifyProperty("dmatName").dictType("STATIC").dictSource("DMAT").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dmtp").modifyProperty("dmtpName").dictType("STATIC").dictSource("DMTP").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("engtp").modifyProperty("engtpName").dictType("STATIC").dictSource("ENGTP").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("fn").modifyProperty("fnName").dictType("STATIC").dictSource("ENG_FN").build());
+        CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("prgr").modifyProperty("prgrName").dictType("STATIC").dictSource("PRGR").build());
+
+
     }
 
 
@@ -306,11 +321,13 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
         SdEngInfoBH after = before == null ? engInfo : BeanUtil.copyProperties(before, SdEngInfoBH.class);
         if (after != null) {
             BeanUtil.copyProperties(engInfo, after, CopyOptions.create().ignoreNullValue());
-            fillRelatedNameFields(after);
+//            fillRelatedNameFields(after);
         }
         boolean result = this.updateById(after);
         if (result && before != null) {
-            msOperationLogService.recordEngUpdateLog(before, after, source);
+            dictCodeToNameConverter.convertCodeToName(engInfo, CODE_TO_NAME_META_LIST);
+            dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST);
+            msOperationLogService.recordModifyDetailLog(engInfo.getStcd(),TABLE_NAME, before, after, source, CODE_TO_NAME_META_LIST);
         }
         return result;
     }
@@ -335,7 +352,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
         fillRelatedNameFields(after);
         boolean result = updateEngInfoByPatch(stcd, after, filteredPatch);
         if (result) {
-            msOperationLogService.recordEngUpdateLog(before, after, source);
+            dictCodeToNameConverter.convertCodeToName(after, CODE_TO_NAME_META_LIST);
+            dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST);
+            msOperationLogService.recordModifyDetailLog(before.getStcd(),TABLE_NAME,before, after, source, CODE_TO_NAME_META_LIST);
         }
         return result;
     }
@@ -595,7 +614,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 .set(SdEngInfoBH::getDeleteTime, new Date()));
         if (result) {
             for (SdEngInfoBH before : beforeList) {
-                msOperationLogService.recordEngDeleteLog(before, source);
+                dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST);
+                msOperationLogService.recordDeleteDetailLog(before.getStcd(),TABLE_NAME, before, source,CODE_TO_NAME_META_LIST);
+//                msOperationLogService.recordEngDeleteLog(before, source);
             }
         }
         return result;