push

yd-product-service/src/main/resources/mappers/AnnouncementCommissionRatioMapper.xml

@@ -148,7 +148,7 @@
             AND DATE(#{request.effectiveDate}) BETWEEN DATE(acr.effective_start) AND DATE(acr.effective_end)
             AND DATE(#{request.effectiveDate}) BETWEEN DATE(acr.effective_start) AND DATE(acr.effective_end)
         </if>
         </if>
 
 
-        <!-- 供款年期（数字）匹配：左开右闭 -->
+        <!-- 供款年期（数字）匹配：左开右闭（保持原有逻辑） -->
         AND (
         AND (
         sa.payment_term_val IS NULL
         sa.payment_term_val IS NULL
         OR (
         OR (
@@ -161,7 +161,7 @@
         (
         (
         SUBSTRING_INDEX(sa.payment_term_val, '-', -1) != ''
         SUBSTRING_INDEX(sa.payment_term_val, '-', -1) != ''
         AND CAST(SUBSTRING_INDEX(sa.payment_term_val, '-', 1) AS UNSIGNED) &lt; #{request.paymentTerm}
         AND CAST(SUBSTRING_INDEX(sa.payment_term_val, '-', 1) AS UNSIGNED) &lt; #{request.paymentTerm}
-        AND CAST(SUBSTRING_INDEX(sa.payment_term_val, '-', -1) AS UNSIGNED) >= #{request.paymentTerm}
+        AND CAST(SUBSTRING_INDEX(sa.payment_term_val, '-', -1) AS UNSIGNED) &gt;= #{request.paymentTerm}
         )
         )
         OR
         OR
         (
         (
@@ -172,7 +172,7 @@
         )
         )
         )
         )
 
 
-        <!-- 投保年龄（区间值）匹配：左开右闭 -->
+        <!-- 投保年龄（区间值）匹配：左闭右闭 -->
         AND (
         AND (
         sa.age_val IS NULL
         sa.age_val IS NULL
         OR (
         OR (
@@ -184,19 +184,19 @@
         AND (
         AND (
         (
         (
         SUBSTRING_INDEX(sa.age_val, '-', -1) != ''
         SUBSTRING_INDEX(sa.age_val, '-', -1) != ''
-        AND CAST(SUBSTRING_INDEX(sa.age_val, '-', 1) AS UNSIGNED) &lt; CAST(#{request.age} AS UNSIGNED)
-        AND CAST(SUBSTRING_INDEX(sa.age_val, '-', -1) AS UNSIGNED) >= CAST(#{request.age} AS UNSIGNED)
+        AND CAST(SUBSTRING_INDEX(sa.age_val, '-', 1) AS UNSIGNED) &lt;= CAST(#{request.age} AS UNSIGNED)
+        AND CAST(SUBSTRING_INDEX(sa.age_val, '-', -1) AS UNSIGNED) &gt;= CAST(#{request.age} AS UNSIGNED)
         )
         )
         OR
         OR
         (
         (
         SUBSTRING_INDEX(sa.age_val, '-', -1) = ''
         SUBSTRING_INDEX(sa.age_val, '-', -1) = ''
-        AND CAST(SUBSTRING_INDEX(sa.age_val, '-', 1) AS UNSIGNED) &lt; CAST(#{request.age} AS UNSIGNED)
+        AND CAST(SUBSTRING_INDEX(sa.age_val, '-', 1) AS UNSIGNED) &lt;= CAST(#{request.age} AS UNSIGNED)
         )
         )
         )
         )
         )
         )
         )
         )
 
 
-        <!-- 期缴保费（区间值）匹配：左开右闭，使用转换后的港币保费 -->
+        <!-- 期缴保费（区间值）匹配：左闭右开，使用转换后的港币保费 -->
         AND (
         AND (
         sa.premium_val IS NULL
         sa.premium_val IS NULL
         OR (
         OR (
@@ -209,13 +209,13 @@
         AND (
         AND (
         (
         (
         SUBSTRING_INDEX(sa.premium_val, '-', -1) != ''
         SUBSTRING_INDEX(sa.premium_val, '-', -1) != ''
-        AND CAST(SUBSTRING_INDEX(sa.premium_val, '-', 1) AS DECIMAL(20,2)) &lt; cp.converted_premium
-        AND CAST(SUBSTRING_INDEX(sa.premium_val, '-', -1) AS DECIMAL(20,2)) >= cp.converted_premium
+        AND CAST(SUBSTRING_INDEX(sa.premium_val, '-', 1) AS DECIMAL(20,2)) &lt;= cp.converted_premium
+        AND CAST(SUBSTRING_INDEX(sa.premium_val, '-', -1) AS DECIMAL(20,2)) &gt; cp.converted_premium
         )
         )
         OR
         OR
         (
         (
         SUBSTRING_INDEX(sa.premium_val, '-', -1) = ''
         SUBSTRING_INDEX(sa.premium_val, '-', -1) = ''
-        AND CAST(SUBSTRING_INDEX(sa.premium_val, '-', 1) AS DECIMAL(20,2)) &lt; cp.converted_premium
+        AND CAST(SUBSTRING_INDEX(sa.premium_val, '-', 1) AS DECIMAL(20,2)) &lt;= cp.converted_premium
         )
         )
         )
         )
         )
         )
@@ -234,7 +234,7 @@
         OR sa.policy_currency_val = #{request.policyCurrency}
         OR sa.policy_currency_val = #{request.policyCurrency}
         )
         )
 
 
-        <!-- 保障年期（数字）匹配：左开右闭 -->
+        <!-- 保障年期（数字）匹配：左开右闭（保持原有逻辑） -->
         AND (
         AND (
         sa.guarantee_period_val IS NULL
         sa.guarantee_period_val IS NULL
         OR (
         OR (
@@ -247,7 +247,7 @@
         (
         (
         SUBSTRING_INDEX(sa.guarantee_period_val, '-', -1) != ''
         SUBSTRING_INDEX(sa.guarantee_period_val, '-', -1) != ''
         AND CAST(SUBSTRING_INDEX(sa.guarantee_period_val, '-', 1) AS UNSIGNED) &lt; CAST(#{request.guaranteePeriod} AS UNSIGNED)
         AND CAST(SUBSTRING_INDEX(sa.guarantee_period_val, '-', 1) AS UNSIGNED) &lt; CAST(#{request.guaranteePeriod} AS UNSIGNED)
-        AND CAST(SUBSTRING_INDEX(sa.guarantee_period_val, '-', -1) AS UNSIGNED) >= CAST(#{request.guaranteePeriod} AS UNSIGNED)
+        AND CAST(SUBSTRING_INDEX(sa.guarantee_period_val, '-', -1) AS UNSIGNED) &gt;= CAST(#{request.guaranteePeriod} AS UNSIGNED)
         )
         )
         OR
         OR
         (
         (