From f8296ab0199d56e96e3c463b3e5b82a498a278f2 Mon Sep 17 00:00:00 2001
From: zhuangdashia <cos35507550@163.com>
Date: Tue, 28 Oct 2025 15:13:44 +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=20=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E7=B3=BB=E7=BB=9F=E5=90=8Dup=20=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BFup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mps/mapper/MpsDetailEntryMapper.java      | 44 ++++++-------
 .../impl/MpsDetailEntryServiceImpl.java       |  4 +-
 .../service/impl/MpsMarketServiceImpl.java    |  2 +-
 .../domain/vo/OriginalHntSgsInfoImportVo.java |  2 +-
 .../mapper/mps/MpsDetailEntryMapper.xml       | 61 +++++++++++++++++++
 5 files changed, 87 insertions(+), 26 deletions(-)

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 22fa8a7..520f3e5 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
@@ -40,28 +40,28 @@ public interface MpsDetailEntryMapper extends BaseMapperPlus<MpsDetailEntry, Mps
         @DataColumn(key = "deptName", value = "m.create_dept"),
         @DataColumn(key = "userName", value = "m.create_by")
     })
-    @Select({
-        "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 ," +
-            " 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 " +
-            "   LEFT JOIN sys_user s ON m.yx_id = s.mkt_no and m.del_flag = '0'"+
-            "   inner JOIN sys_dept d ON s.dept_id = d.dept_id "+
-            "   inner JOIN sys_dept de ON m.dept_id = de.dept_id  "+
-            "${ew.customSqlSegment}"+
-            "and m.del_flag = '0'  order by m.entry_date desc"
-    })
+//    @Select({
+//        "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 ," +
+//            " 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 " +
+//            "   LEFT JOIN sys_user s ON m.yx_id = s.mkt_no and m.del_flag = '0'"+
+//            "   inner JOIN sys_dept d ON s.dept_id = d.dept_id "+
+//            "   inner JOIN sys_dept de ON m.dept_id = de.dept_id  "+
+//            "${ew.customSqlSegment}"+
+//            "and m.del_flag = '0'  order by m.entry_date desc"
+//    })
      List<MpsDetailEntryExportVo> selectMpsDetailEntryExportList(@Param(Constants.WRAPPER) Wrapper<MpsDetailEntry> queryWrapper);
 
 }
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java
index 0146256..3b97707 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java
@@ -107,7 +107,7 @@ public class MpsDetailEntryServiceImpl implements IMpsDetailEntryService {
     @Override
     public List<MpsDetailEntryExportVo> queryList(MpsDetailEntryBo bo) {
         LambdaQueryWrapper<MpsDetailEntry> lqw = buildQueryWrapper(bo);
-//        lqw.eq(""MpsDetailEntry::getDelFlag"", '0');
+        lqw.eq(MpsDetailEntry::getDelFlag, '0');
         return baseMapper.selectMpsDetailEntryExportList(lqw);
 //        return baseMapper.selectVoList(lqw);
     }
@@ -115,7 +115,7 @@ public class MpsDetailEntryServiceImpl implements IMpsDetailEntryService {
     private LambdaQueryWrapper<MpsDetailEntry> buildQueryWrapper(MpsDetailEntryBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MpsDetailEntry> lqw = Wrappers.lambdaQuery();
-//        lqw.orderByAsc(MpsDetailEntry::getDataId);
+        lqw.orderByDesc(MpsDetailEntry::getDate);
         lqw.eq(StringUtils.isNotBlank(bo.getSubcategoryId()), MpsDetailEntry::getSubcategoryId, bo.getSubcategoryId());
         lqw.like(StringUtils.isNotBlank(bo.getSubcategoryName()), MpsDetailEntry::getSubcategoryName, bo.getSubcategoryName());
         lqw.like(StringUtils.isNotBlank(bo.getYxName()), MpsDetailEntry::getYxName, bo.getYxName());
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
index d6d2a84..ed0b6ce 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
@@ -456,7 +456,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
              */
             String[] arr = new String[]{"62152109", "62169009", "62231909", "62232009", "62326591", "90010509"};
             if (!Arrays.asList(arr).contains(entity.getCustAcctNo().substring(0, 8))) {
-                throw new ServiceException("银行卡前8位不支持！");
+                throw new ServiceException("非本行开立银行卡！");
             }
             mpsMarket.setCustAcctNo(entity.getCustAcctNo());
             mpsMarket.setSubcategoryId(entity.getSubcategoryId());
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgsInfoImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgsInfoImportVo.java
index f70be49..351c410 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgsInfoImportVo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgsInfoImportVo.java
@@ -46,7 +46,7 @@ public class OriginalHntSgsInfoImportVo implements Serializable {
      */
     @ExcelProperty(value = {
         "签约ID"
-    }, index = 1)
+    })
     @NotBlank(message = "签约ID不能为空")
     private String contractId;
 
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml b/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml
index 86b9b95..bc78bf0 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml
@@ -3,5 +3,66 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.mps.mapper.MpsDetailEntryMapper">
+    <resultMap id="MarketResultMap" type="org.dromara.mps.domain.vo.MpsDetailEntryExportVo">
+        <!-- 基本字段映射 -->
+        <id column="market_id" property="marketId"/>
+        <result column="jb_name" property="jbName"/>
+        <result column="jb_id" property="jbId"/>
+        <result column="yx_name" property="yxName"/>
+        <result column="yx_id" property="yxId"/>
+        <result column="date" property="date"/>
+        <result column="cust_name" property="custName"/>
+        <result column="cust_type" property="custType"/>
+        <result column="subcategory_name" property="subcategoryName"/>
+        <result column="cust_phone_no" property="custPhoneNo"/>
+        <result column="cust_id" property="custId"/>
+        <result column="cust_acct_no" property="custAcctNo"/>
+        <result column="acquiring_name" property="acquiringName"/>
+        <result column="acquiring_id" property="acquiringId"/>
+        <result column="internet_channel" property="internetChannel"/>
+        <result column="workplace" property="workplace"/>
+        <result column="surplus_account_name" property="surplusAccountName"/>
+        <result column="heating_no" property="heatingNo"/>
+        <result column="branch_name" property="branchName"/>
+        <result column="check_msg" property="checkMsg"/>
+        <result column="del_flag" property="delFlag"/>
 
+        <!-- 关联表字段映射 -->
+        <result column="oldCardNo" property="oldCardNo"/>
+        <result column="newCardNo" property="newCardNo"/>
+        <result column="affair" property="affair"/>
+        <result column="trafficNo" property="trafficNo"/>
+        <result column="trafficAmt" property="trafficAmt"/>
+        <result column="yxDeptName" property="yxDeptName"/>
+        <result column="deptName" property="deptName"/>
+        <result column="checkFlag" property="checkFlag"/>
+    </resultMap>
+
+
+    <select id="selectMpsDetailEntryExportList" resultMap="MarketResultMap" parameterType="map">
+      select * from (
+        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,
+        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
+        LEFT JOIN sys_user s ON m.yx_id = s.mkt_no
+        LEFT JOIN sys_dept d ON s.dept_id = d.dept_id
+        LEFT JOIN sys_dept de ON m.dept_id = de.dept_id
+        where m.del_flag='0'
+        ) temp ${ew.customSqlSegment}
+
+    </select>
 </mapper>