Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java

@@ -45,15 +45,6 @@ public interface ScreenPartyUserRankDataDao extends BaseDao<ScreenPartyUserRankD
      **/
     Integer deletePartyUserRankData(@Param("customerId") String customerId);
 
-    /**
-     * @Description 按照客户、月份删除
-     * @param
-     * @return java.lang.Integer
-     * @author wangc
-     * @date 2020.09.27 11:19
-    */
-    Integer deleteBatchByCustomerIdAndDateId(@Param("customerId") String customerId);
-
     /**
      * 9、党建引领|基层治理-居民（党员）积分排行榜
      *    2) 在批量新增

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyUserRankDataServiceImpl.java

@@ -59,7 +59,7 @@ public class ScreenPartyUserRankDataServiceImpl extends BaseServiceImpl<ScreenPa
         if(!CollectionUtils.isEmpty(dataList)) {
             int affectedRows;
             do {
-                affectedRows = baseDao.deleteBatchByCustomerIdAndDateId(customerId);
+                affectedRows = baseDao.deletePartyUserRankData(customerId);
             } while (affectedRows > NumConstant.ZERO);
             baseDao.insertBatch(dataList);
         }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPartyUserRankDataDao.xml

@@ -9,12 +9,6 @@
         limit 1000;
     </delete>
 
-    <delete id="deleteBatchByCustomerIdAndDateId">
-        delete from screen_party_user_rank_data
-        where CUSTOMER_ID = #{customerId}
-        limit 1000;
-    </delete>
-
     <insert id="batchInsertPartyUserRankData" parameterType="map">
         insert into screen_party_user_rank_data
         (