From 260fbe6201a36d0391e8eca1865b48873d338c73 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 27 May 2022 13:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=EF=BC=8C=E7=BB=9F=E8=AE=A1=E6=95=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/PartyMemberPointListResultDTO.java |  2 +-
 .../IcPartyMemberPointController.java         |  6 +--
 .../service/IcPartyMemberPointService.java    |  2 +-
 .../impl/IcPartyMemberPointServiceImpl.java   | 31 +++++++++-----
 .../partymember/IcPartyMemberPointDao.xml     | 42 +++++++++----------
 5 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointListResultDTO.java
index ff27a4b5b3..2670024446 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointListResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointListResultDTO.java
@@ -36,7 +36,7 @@ public class PartyMemberPointListResultDTO implements Serializable {
     /**
      * 总分
      */
-    private Integer TotalScore;
+    private Integer totalScore;
 
     /**
      *基础积分分值
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java
index 21d1f79824..07af853ce1 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java
@@ -163,9 +163,9 @@ public class IcPartyMemberPointController {
      * @date 2022/5/17 17:19
      */
     @PostMapping("getList")
-    public Result<List<PartyMemberPointListResultDTO>> getList(@RequestBody PartyMemberPointListFormDTO form, @LoginUser TokenDto tokenDto) {
-        List<PartyMemberPointListResultDTO> dto = icPartyMemberPointService.getList(form, tokenDto);
-        return new Result<List<PartyMemberPointListResultDTO>>().ok(dto);
+    public Result<PageData<PartyMemberPointListResultDTO>> getList(@RequestBody PartyMemberPointListFormDTO form, @LoginUser TokenDto tokenDto) {
+        PageData<PartyMemberPointListResultDTO> dto = icPartyMemberPointService.getList(form, tokenDto);
+        return new Result<PageData<PartyMemberPointListResultDTO>>().ok(dto);
     }
 
     /**
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java
index e35838aa38..701ce482aa 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java
@@ -93,7 +93,7 @@ public interface IcPartyMemberPointService extends BaseService<IcPartyMemberPoin
      * @author LZN
      * @date 2022/5/17 17:19
      */
-    List<PartyMemberPointListResultDTO> getList(PartyMemberPointListFormDTO form, TokenDto tokenDto);
+    PageData<PartyMemberPointListResultDTO> getList(PartyMemberPointListFormDTO form, TokenDto tokenDto);
 
     /**
      * 量化积分统计回显
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 62a91aa312..b5e7471213 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
@@ -30,7 +30,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Time;
+import java.time.Year;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
@@ -80,21 +83,32 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPartyMemberPointDTO dto) {
-        IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class);
         dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint());
         if (dto.getWarnPoint() > 0) {
             dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
         } else {
             dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint());
         }
-        baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore());
+        IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class);
+        if(dto.getYear().equals(Year.now().toString())){
+            baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore());
+        }
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcPartyMemberPointDTO dto) {
+        dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint());
+        if (dto.getWarnPoint() > 0) {
+            dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
+        } else {
+            dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint());
+        }
         IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class);
+        if(dto.getYear().equals(Year.now().toString())){
+            baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore());
+        }
         updateById(entity);
     }
 
@@ -115,13 +129,12 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
      * @date 2022/5/18 18:20
      */
     @Override
-    public List<PartyMemberPointListResultDTO> getList(PartyMemberPointListFormDTO form, TokenDto tokenDto) {
+    public PageData<PartyMemberPointListResultDTO> getList(PartyMemberPointListFormDTO form, TokenDto tokenDto) {
+        PageHelper.startPage(form.getPageNo(), form.getPageSize(), form.getIsPage());
         List<PartyMemberPointListResultDTO> dto = baseDao.getList(form.getIdCard(), form.getMobile(), form.getName(),
                 form.getOrgId(), form.getYear(), tokenDto.getCustomerId());
-        dto.forEach(item -> {
-            item.setTotalScore(item.getTotalScore() / item.getQuarter());
-        });
-        return dto;
+        PageInfo<PartyMemberPointListResultDTO> pageInfo = new PageInfo<>(dto);
+        return new PageData<>(dto, pageInfo.getTotal());
     }
 
     /**
@@ -151,10 +164,6 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
         PageHelper.startPage(form.getPageNo(), form.getPageSize(), form.getIsPage());
         List<PartyMemberPointListResultDTO> dto = baseDao.getList(form.getIdCard(), form.getMobile(), form.getName(),
                 form.getOrgId(), form.getYear(), tokenDto.getCustomerId());
-        // 算总分
-        dto.forEach(item -> {
-            item.setTotalScore(item.getTotalScore() / item.getQuarter());
-        });
         PageInfo<PartyMemberPointListResultDTO> 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 b0a71183f9..3876ddf432 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
@@ -13,22 +13,21 @@
     <select id="getList"
             resultType="com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO">
         SELECT
-        a.year,
-        a.PARTY_MEMBER_ID,
-        sum( a.total_score ) as totalScore,
-        count(a.QUARTER) as quarter,
-        c.PARTY_ORG_NAME as partyOrg,
-        u.NAME,
-        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
+            a.year,
+            a.PARTY_MEMBER_ID,
+            AVG ( a.total_score ) as totalScore,
+            c.PARTY_ORG_NAME as partyOrg,
+            u.NAME,
+            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
         FROM
-        ic_party_member u
-        LEFT JOIN ic_party_member_point a ON a.PARTY_MEMBER_ID = u.id
+            ic_party_member_point a
+        LEFT JOIN ic_party_member u 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'
@@ -50,13 +49,14 @@
             <if test="orgId != null and orgId != ''">
                 AND c.id = #{orgId}
             </if>
+
         </where>
-        GROUP BY u.ID
-        ORDER BY
-        a.YEAR DESC,
-        u.sszb ASC,
-        a.total_score ASC,
-        a.CREATED_TIME
+            GROUP BY a.YEAR,a.PARTY_MEMBER_ID
+            ORDER BY
+                a.YEAR DESC,
+                u.sszb ASC,
+                sum( a.total_score ) DESC,
+                a.CREATED_TIME
     </select>
     <select id="getListCount"
             resultType="com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO">