Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

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

@@ -52,7 +52,7 @@ public interface ScreenPartyUserRankDataDao extends BaseDao<ScreenPartyUserRankD
      * @author wangc
      * @date 2020.09.27 11:19
     */
-    Integer deleteBatchByCustomerIdAndDateId(@Param("customerId") String customerId,@Param("dateId") String dateId);
+    Integer deleteBatchByCustomerIdAndDateId(@Param("customerId") String customerId);
 
     /**
      * 9、党建引领|基层治理-居民（党员）积分排行榜

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -122,7 +122,8 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         }
 
         //6.存入数据库
-        screenPartyUserRankDataService.dataClean(registeredUsers,param.getCustomerId(),dateId);
+        //不按照时间删除，每次插入之前将该客户下的所有历史数据清空
+        screenPartyUserRankDataService.dataClean(registeredUsers,param.getCustomerId());
     }
 
     /**

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

@@ -39,6 +39,6 @@ public interface ScreenPartyUserRankDataService extends BaseService<ScreenPartyU
      * @author wangc
      * @date 2020.09.27 09:44
     **/
-    void dataClean(List<ScreenPartyUserRankDataEntity> dataList,String customerId,String dateId);
+    void dataClean(List<ScreenPartyUserRankDataEntity> dataList,String customerId);
 
 }

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

@@ -55,11 +55,11 @@ public class ScreenPartyUserRankDataServiceImpl extends BaseServiceImpl<ScreenPa
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void dataClean(List<ScreenPartyUserRankDataEntity> dataList, String customerId, String dateId) {
+    public void dataClean(List<ScreenPartyUserRankDataEntity> dataList, String customerId) {
         if(!CollectionUtils.isEmpty(dataList)) {
             int affectedRows;
             do {
-                affectedRows = baseDao.deleteBatchByCustomerIdAndDateId(customerId, dateId);
+                affectedRows = baseDao.deleteBatchByCustomerIdAndDateId(customerId);
             } while (affectedRows > NumConstant.ZERO);
             baseDao.insertBatch(dataList);
         }

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

@@ -12,7 +12,6 @@
     <delete id="deleteBatchByCustomerIdAndDateId">
         delete from screen_party_user_rank_data
         where CUSTOMER_ID = #{customerId}
-        AND DATA_END_TIME = #{dateId}
         limit 1000;
     </delete>