From 150ce57bfbc2ac94d9ba3552666eca000535e945 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Wed, 28 May 2025 10:50:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E8=84=89=EF=BC=9A1=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=BD=B1=E5=93=8D=E5=9B=A0=E7=B4=A0=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/AeConfInfluenceFactorCorrelationEntity.java      | 6 ++++--
 .../entity/AeConfInfluenceFactorCorrelationEntity.xml       | 2 +-
 .../impl/AeConfInfluenceFactorCorrelationServiceImpl.java   | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.java
index 22761698..ff3da45a 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.java
@@ -28,13 +28,15 @@ public class AeConfInfluenceFactorCorrelationEntity extends BaseEntity {
      */
     private String mdmId;
     /**
-     * 主数据code
+     * 主数据code，对应en_code
      */
     private String mdmCode;
+    private String enCode;
     /**
-     * 主数据name
+     * 主数据name，对应ch_code
      */
     private String mdmName;
+    private String chCode;
     /**
      * 映射字段id
      */
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.xml
index 0a238c67..44e12246 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.xml
@@ -368,7 +368,7 @@
             parameterType="com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorCorrelationEntity">
         update ae_conf_influence_factor_correlation
         set sts= 'N',
-            modify_time = now(),
+            modify_time = now()
         <if test="modifyUser != null and modifyUser != ''">,modify_user = #{modifyUser}</if>
         where id = #{id}
     </update>
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java
index d8040787..c299d501 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java
@@ -35,7 +35,8 @@ public class AeConfInfluenceFactorCorrelationServiceImpl extends BaseService<AeC
 
     @Override
     public List<AeConfInfluenceFactorCorrelationEntity> queryAll(AeConfInfluenceFactorCorrelationEntity entity) {
-        return null;
+        List<AeConfInfluenceFactorCorrelationEntity> query = aeConfInfluenceFactorCorrelationDao.query(entity);
+        return query;
     }
 
     @Override