From b826f289d9f1e81692f9948bc60de63ade2c2354 Mon Sep 17 00:00:00 2001
From: jianlin <q614588746@163.com>
Date: Mon, 19 May 2025 16:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=B8=81bug=E4=BF=AE=E6=94=B95.19?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=95=86=E5=93=81homilyChart=E9=87=91?=
 =?UTF-8?q?=E5=B8=81=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/RefundA.java    |  2 +-
 .../com/example/demo/serviceImpl/RefundServiceImpl.java  |  6 ++++++
 src/main/resources/mapper/RefundMapper.xml               | 16 +++++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/RefundA.java b/src/main/java/com/example/demo/domain/vo/RefundA.java
index 3d18d5f..d92abfb 100644
--- a/src/main/java/com/example/demo/domain/vo/RefundA.java
+++ b/src/main/java/com/example/demo/domain/vo/RefundA.java
@@ -41,5 +41,5 @@ public class RefundA  implements Serializable {
     private String category;
     private BigDecimal amount;
     private List<String> areas;
-
+    private Boolean hasIndexMatch;
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
index 3bb9a86..0ac46a4 100644
--- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
@@ -146,6 +146,12 @@ public class RefundServiceImpl implements RefundService {
 
     @Override
     public List<RefundA> getRefundA(RefundA refundA) {
+
+        // 如果 refundGoods 存在，则判断是否匹配 index 表中的 remark
+        if (refundA.getRefundGoods() != null && !refundA.getRefundGoods().trim().isEmpty()) {
+            boolean matchExists = refundMapper.isIndexTypeExist(refundA.getRefundGoods());
+            refundA.setHasIndexMatch(matchExists); // 设置标志位
+        }
         // 执行原始查询，获取实际存在的分类及其汇总值
         List<RefundA> result = refundMapper.getRefundA(refundA);
 
diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml
index 0ef7935..ed20662 100644
--- a/src/main/resources/mapper/RefundMapper.xml
+++ b/src/main/resources/mapper/RefundMapper.xml
@@ -34,7 +34,21 @@
             <if test='startDate != null and endDate != null'>AND d.create_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test='area!=null and area.length>0'>and user.area=#{area}</if>
             <if test='refundType != null and refundType.length>0'>AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')</if>
-            <if test='refundGoods != null and refundGoods.length>0'>AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')</if>
+            <if test='refundGoods != null and refundGoods.length() > 0'>
+                <choose>
+                    <!-- 是否走精确匹配 -->
+                    <when test="hasIndexMatch">
+                        AND d.refund_goods IN (
+                        SELECT name FROM `index`
+                        WHERE type = 1 AND remark = #{refundGoods}
+                        )
+                    </when>
+                    <!-- 否则模糊匹配 -->
+                    <otherwise>
+                        AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')
+                    </otherwise>
+                </choose>
+            </if>
             <if test="areas != null">
                 AND area IN
                 <foreach collection="areas" item="areas" open="(" separator="," close=")">