修改量化积分修改时逻辑

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);
+
+    void updateByPartyMemberId(@Param("entity") IcPartyMemberPointEntity entity);
 }

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);
         }

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