From 24afd594235a9b7781a39460dc243f2e3edd1d11 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 9 Jun 2022 11:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8F=E5=8C=96=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E4=BF=AE=E6=94=B9=E6=97=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/IcPartyMemberPointDao.java            |  4 ++-
 .../impl/IcPartyMemberPointServiceImpl.java   |  4 +--
 .../partymember/IcPartyMemberPointDao.xml     | 27 +++++++++++++++----
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java
index 9e44e7d2b6..ed745c2b90 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java
@@ -47,4 +47,6 @@ public interface IcPartyMemberPointDao extends BaseDao<IcPartyMemberPointEntity>
                      @Param("quarter") String quarter,
                      @Param("customerId") String customerId,
                      @Param("partyMemberId") String partyMemberId);
-}
\ No newline at end of file
+
+    void updateByPartyMemberId(@Param("entity") IcPartyMemberPointEntity entity);
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
index e17339ad22..b9dc97951c 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
@@ -136,7 +136,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
             if (dto.getYear().equals(Year.now().toString())) {
                 baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore());
             }
-            updateById(entity);
+            baseDao.updateByPartyMemberId(entity);
         } else {
             save(dto);
         }
@@ -200,4 +200,4 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml
index 60fa191f70..53ac16d111 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml
@@ -8,6 +8,23 @@
         WHERE
             id = #{partyMemberId}
     </update>
+    <update id="updateByPartyMemberId">
+        UPDATE ic_party_member_point
+        SET BASE_POINT = #{entity.basePoint},
+        BASE_OPTIONS = #{entity.baseOptions},
+        REVIEW_POINT = #{entity.reviewPoint},
+        REVIEW_OPTIONS = #{entity.reviewOptions},
+        INSPIRE_POINT = #{entity.inspirePoint},
+        INSPIRE_OPTIONS = #{entity.inspireOptions},
+        WARN_POINT = #{entity.warnPoint},
+        WARN_OPTIONS = #{entity.warnOptions}
+        WHERE
+            PARTY_MEMBER_ID = #{entity.partyMemberId}
+            AND YEAR = #{entity.year},
+            AND QUARTER = #{entity.quarter}
+            AND DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{entity.customerId}
+    </update>
 
 
     <select id="getList"
@@ -21,10 +38,10 @@
             u.MOBILE,
             u.ID_CARD,
             u.REMARK,
-            sum( a.BASE_POINT ) AS BasePoint,
-            sum( a.REVIEW_POINT ) AS reviewPoint,
-            sum( a.INSPIRE_POINT ) AS inspirePoint,
-            sum( a.WARN_POINT ) AS warnPoint
+            AVG( a.BASE_POINT ) AS BasePoint,
+            AVG( a.REVIEW_POINT ) AS reviewPoint,
+            AVG( a.INSPIRE_POINT ) AS inspirePoint,
+            AVG( a.WARN_POINT ) AS warnPoint
         FROM
             ic_party_member_point a
         LEFT JOIN ic_party_member u ON a.PARTY_MEMBER_ID = u.id
@@ -168,4 +185,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>