From f9f0f3534ffc3508dc8b87bbbfd2bc85b855366e Mon Sep 17 00:00:00 2001
From: zhuangdashia <cos35507550@163.com>
Date: Wed, 22 Oct 2025 14:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E5=BD=95=E5=85=A5=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86,=E5=AF=BC=E5=87=BA=E7=BD=9A=E6=B2=A1=E6=AC=BE?=
 =?UTF-8?q?=E5=92=8C=E6=8D=A2=E5=8D=A1=20=E5=8F=96=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84chenkflag=20=E5=AF=BC=E5=87=BA=E6=88=B7=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java | 2 +-
 .../org/dromara/mps/domain/vo/MpsDetailEntryImportVo.java | 2 +-
 .../java/org/dromara/mps/mapper/MpsDetailEntryMapper.java | 8 +++++++-
 .../dromara/report/domain/vo/MarketingValidInvalidVo.java | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java
index 465aa5b..34d14c1 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java
@@ -181,7 +181,7 @@ public class MpsDetailEntryExportVo implements Serializable {
     /**
      * 取暖费户号
      */
-    @ExcelProperty(value = "取暖费户号")
+    @ExcelProperty(value = "户号")
     private String heatingNo;
 
 
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryImportVo.java
index 52aabc5..7468a76 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryImportVo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryImportVo.java
@@ -168,7 +168,7 @@ public class MpsDetailEntryImportVo implements Serializable {
     /**
      * 取暖费户号
      */
-    @ExcelProperty(value = "取暖费户号")
+    @ExcelProperty(value = "户号")
     private String heatingNo;
 
     /**
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java
index cd2e900..22fa8a7 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java
@@ -44,9 +44,15 @@ public interface MpsDetailEntryMapper extends BaseMapperPlus<MpsDetailEntry, Mps
         "select " +
             "c.old_card_no as oldCardNo , c.new_card_no as newCardNo, c.replace_method as affair ," +
             "t.traffic_no  as trafficNo  ,t.traffic_amt as trafficAmt, " +
+
             "m.* ," +
             "d.dept_name AS yxDeptName ," +
-            "de.dept_name AS deptName " +
+            "de.dept_name AS deptName ," +
+            " CASE " +
+            "        WHEN m.traffic_id IS NOT NULL THEN t.check_flag " +
+            "        WHEN m.magnetic_card_id IS NOT NULL THEN c.check_flag " +
+            "        ELSE m.check_flag " +
+            "    END AS checkFlag  "+
             "from mps_market m " +
             "    left join mps_traffic t on  m.traffic_id = t.traffic_id " +
             "    left join mps_magneticcard c on  m.magnetic_card_id = c.magnetic_card_id " +
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java
index f251207..42ea91f 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java
@@ -80,7 +80,7 @@ public class MarketingValidInvalidVo implements Serializable {
      * 有效无效标识
      */
     @ExcelProperty(value = "有效无效标识", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "report_valid_invalid")
+    @ExcelDictFormat(readConverterExp = "1=有效,9=无效")
     private String checkFlag;
 
     /**