From eab6adb518b96ef23335f82d6339614d053d75a8 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 25 May 2022 17:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B1=82=E5=92=8C=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAsql=E6=B1=82=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcPartyMemberPointServiceImpl.java   |  4 +-
 .../partymember/IcPartyMemberPointDao.xml     | 65 ++++++++++---------
 2 files changed, 34 insertions(+), 35 deletions(-)

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 156c9341aa..1ea27ad263 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
@@ -170,9 +170,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
     public PageData<PartyMemberPointExportResultDTO> getExport(PartyMemberExportFormDTO form,String customerId) {
         PageHelper.startPage(form.getPageNo(), form.getPageSize(), form.getIsPage());
         List<PartyMemberPointExportResultDTO> dto = baseDao.getExport(form,customerId);
-        dto.forEach(item -> {
-            item.setTotalScore(item.getBasePoint() + item.getInspirePoint() + item.getReviewPoint() + item.getWarnPoint());
-        });
+
         PageInfo<PartyMemberPointExportResultDTO> pageInfo = new PageInfo<>(dto);
         return new PageData<>(dto, pageInfo.getTotal());
     }
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 9c600e7309..ea48b3650b 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
@@ -7,22 +7,22 @@
     <select id="getList"
             resultType="com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO">
         SELECT
-            c.PARTY_ORG_NAME as partyOrg,
-            u.NAME,
-            u.MOBILE,
-            u.ID_CARD,
-            u.REMARK,
-            a.year,
-            sum( a.BASE_POINT ) AS BasePoint,
-            sum( a.REVIEW_POINT ) AS reviewPoint,
-            sum( a.INSPIRE_POINT ) AS inspirePoint,
-            sum( a.WARN_POINT ) AS warnPoint
+        c.PARTY_ORG_NAME as partyOrg,
+        u.NAME,
+        u.MOBILE,
+        u.ID_CARD,
+        u.REMARK,
+        a.year,
+        sum( a.BASE_POINT ) AS BasePoint,
+        sum( a.REVIEW_POINT ) AS reviewPoint,
+        sum( a.INSPIRE_POINT ) AS inspirePoint,
+        sum( a.WARN_POINT ) AS warnPoint
         FROM
-            ic_party_member u
-            LEFT JOIN ic_party_member_point a ON a.PARTY_MEMBER_ID = u.id
-            AND a.DEL_FLAG = '0'
-            LEFT JOIN ic_party_org c ON c.id = u.sszb
-            AND c.DEL_FLAG = '0'
+        ic_party_member u
+        LEFT JOIN ic_party_member_point a ON a.PARTY_MEMBER_ID = u.id
+        AND a.DEL_FLAG = '0'
+        LEFT JOIN ic_party_org c ON c.id = u.sszb
+        AND c.DEL_FLAG = '0'
         <where>
             u.DEL_FLAG = '0'
             AND u.CUSTOMER_ID = #{customerId}
@@ -44,22 +44,22 @@
         </where>
         GROUP BY u.ID
         ORDER BY
-            a.YEAR DESC,
-            u.sszb ASC,
-            a.total_score ASC,
-            a.CREATED_TIME
+        a.YEAR DESC,
+        u.sszb ASC,
+        a.total_score ASC,
+        a.CREATED_TIME
     </select>
     <select id="getListCount"
             resultType="com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO">
         SELECT
-            count( a.BASE_POINT ) AS basePointCount,
-            count( a.REVIEW_POINT ) AS reviewPointCount,
-            count( a.INSPIRE_POINT ) AS inspirePointCount,
-            count( a.WARN_POINT ) AS warnPointCount
+        count( a.BASE_POINT ) AS basePointCount,
+        count( a.REVIEW_POINT ) AS reviewPointCount,
+        count( a.INSPIRE_POINT ) AS inspirePointCount,
+        count( a.WARN_POINT ) AS warnPointCount
         FROM
-            ic_party_member u
-            LEFT JOIN ic_party_member_point a ON a.PARTY_MEMBER_ID = u.id
-            AND a.DEL_FLAG = '0'
+        ic_party_member u
+        LEFT JOIN ic_party_member_point a ON a.PARTY_MEMBER_ID = u.id
+        AND a.DEL_FLAG = '0'
         <where>
             u.DEL_FLAG = '0'
             AND u.CUSTOMER_ID = #{customerId}
@@ -68,12 +68,12 @@
             </if>
         </where>
         GROUP BY
-            u.id
+        u.id
         ORDER BY
-            a.YEAR DESC,
-            u.sszb ASC,
-            a.total_score ASC,
-            a.CREATED_TIME
+        a.YEAR DESC,
+        u.sszb ASC,
+        a.total_score ASC,
+        a.CREATED_TIME
     </select>
     <select id="getEchoPartyMemberPoint"
             resultType="com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO">
@@ -86,7 +86,8 @@
             INSPIRE_POINT,
             INSPIRE_OPTIONS,
             WARN_POINT,
-            WARN_OPTIONS
+            WARN_OPTIONS,
+            sum ( BASE_POINT + REVIEW_POINT + INSPIRE_POINT + WARN_POINT ) as totalScore
         FROM
             ic_party_member_point
 	    where