From 150061c68cc84b795b24295a68a91c9230b19321 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 17 Jun 2022 14:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/List4applyFormDTO.java    | 6 ++++++
 .../src/main/resources/mapper/PointAdditiveRuleDao.xml     | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java
index 441bf8d353..b9fd87d5b2 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java
@@ -30,6 +30,12 @@ public class List4applyFormDTO implements Serializable {
      */
     private String type;
 
+    /**
+     *积分奖励point_reward；积分扣罚point_fine
+     */
+    @NotNull(message = "奖罚编码不可为空")
+    private String businessCode;
+
 
 
     private String customerId;
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
index 229184ac62..5bfb46e1d4 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
@@ -53,12 +53,19 @@
 			and CATEGORY_CODE=#{categoryCode}
             <if test="applyFlag != null and applyFlag != ''">
                 and APPLY_FLAG= #{applyFlag}
+            </if>
+            <if test="businessCode != null and businessCode != '' and businessCode == 'point_fine'.toString()">
+                and (( type='rule' and POINT_VALUE &lt; 0 )or TYPE='category')
+            </if>
+            <if test="businessCode != null and businessCode != '' and businessCode == 'point_reward'.toString()">
+                and (( type='rule' and POINT_VALUE &gt; 0 )or TYPE='category')
             </if>
 			and CUSTOMER_ID=#{customerId}
         order by UPDATED_TIME desc
     </select>
     <select id="selectList4tree" resultType="com.epmet.dto.PointAdditiveRuleDTO">
         select id,
+               pid,
 			 type,
 			 CATEGORY_NAME,
 			 RULE_NAME,