From 17ec34770bf491b65a530d9df2cfcad1921dfb27 Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Wed, 24 Sep 2025 13:25:16 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E7=9B=B4=E6=8E=A8=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE,=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AcRecommendConfigController.java          |  5 +++--
 .../recommend/AcRecomUpgradeRecordMapper.xml  | 21 +++++++++----------
 .../common/core/enums/EOperationBusiness.java |  2 ++
 .../common/core/enums/EOperationModule.java   |  2 ++
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java
index 4c12a4e7..fc200098 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java
@@ -70,7 +70,7 @@ public class AcRecommendConfigController extends BaseController {
      * @param acDirectPushUpgradeParam
      * @return
      */
-    @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.INSERT, remark = "在线签呈")
+    @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.INSERT)
     @PostMapping("/directPushUpgrade")
     public AjaxResult directPushUpgradeSubmit(@RequestBody AcDirectPushUpgradeParam acDirectPushUpgradeParam) {
         acDirectPushUpgradeParam.setPkCountry(SecurityUtils.getPkCountry());
@@ -87,13 +87,14 @@ public class AcRecommendConfigController extends BaseController {
      * @param param
      * @return
      */
-    @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.SELECT, remark = "在线签呈")
+    @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE_LIST, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/directPushUpgradeList")
     public TableDataInfo directPushUpgradeList(AcDirectPushUpgradeListParam param) {
         startPage();
         return getDataTable(iAcRecomUpgradeRecordService.queryList(param));
     }
 
+    @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE_LIST, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE_LIST, method = EOperationMethod.SELECT)
     @PostMapping("/directPushUpgradeExport")
     public void export(AcDirectPushUpgradeListParam param, HttpServletResponse response) {
         startPage();
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
index 19215d02..8bc3b85b 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
@@ -64,8 +64,8 @@
       <select id="queryList" resultType="com.hzs.activity.recommend.dto.AcDirectPushUpgradeListDTO">
         SELECT
         abc.ACT_NAME,
-        cmm.member_code,
-        cmm.member_name,
+        cm.member_code,
+        cm.member_name,
         arur.PK_SETTLE_GRADE,
         arur.PK_RECOMMEND_GRADE,
         abc.ACT_START_DATE,
@@ -75,26 +75,25 @@
         FROM
         AC_RECOM_UPGRADE_RECORD arur
         LEFT JOIN AC_BASE_CONFIG abc ON arur.PK_BASE_ID = abc.PK_ID
-        LEFT JOIN CU_MEMBER cm ON arur.pk_member = cm.PK_PARENT
-        LEFT JOIN CU_MEMBER cmm ON cm.PK_PARENT = cmm.PK_ID
+        LEFT JOIN CU_MEMBER cm ON arur.pk_member = cm.PK_ID
         WHERE arur.DEL_FLAG = 0
         <if test="actName != null">
             AND abc.ACT_NAME = #{actName}
         </if>
         <if test="memberCode != null">
-            AND cmm.member_code = #{memberCode}
+            AND cm.member_code = #{memberCode}
         </if>
         <if test="startActStartDate != null">
-            AND abc.ACT_START_DATE >= #{startActStartDate}
+            AND abc.ACT_START_DATE >= #{startActStartDate,javaType=DATE}
         </if>
         <if test="startActEndDate != null">
-            AND abc.ACT_START_DATE &lt;= #{startActEndDate}
-        </if>
-        <if test="startActEndDate != null">
-            AND abc.ACT_END_DATE >= #{endActStartDate}
+            AND abc.ACT_START_DATE &lt;= #{startActEndDate,javaType=DATE}
         </if>
         <if test="endActStartDate != null">
-            AND abc.ACT_END_DATE &lt;= #{endActEndDate}
+            AND abc.ACT_END_DATE >= #{endActStartDate,javaType=DATE}
+        </if>
+        <if test="endActEndDate != null">
+            AND abc.ACT_END_DATE &lt;= #{endActEndDate,javaType=DATE}
         </if>
     </select>
 
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
index f0952f1d..1df60249 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
@@ -256,6 +256,8 @@ public enum EOperationBusiness {
 
     AC_DIRECT_PUSH_UPGRADE("直推升级"),
 
+    AC_DIRECT_PUSH_UPGRADE_LIST("直推升级数据"),
+
 
     AC_WARES_RULE_CONFIG("商品赠送"),
 
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
index 60a4ed28..967ea00b 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
@@ -355,6 +355,8 @@ public enum EOperationModule {
 
     AC_DIRECT_PUSH_UPGRADE("直推升级"),
 
+    AC_DIRECT_PUSH_UPGRADE_LIST("直推升级数据"),
+
     AC_TOURISM_CONFIG("旅游活动"),
 
     AC_WARES_RULE_CONFIG("商品赠送"),