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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java

@@ -135,15 +135,10 @@ public class StatsGroupServiceImpl implements StatsGroupService {
             if (customerIds.size() != NumConstant.ZERO) {
                 DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
                 customerIds.forEach(customerId -> {
-                    Boolean status = true;
                     try {
                         List<DimAgencyDTO> customerAgencyInfos = dimAgencyService.getAgencyInfoByCustomerId(customerId);
-                        List<List<DimAgencyDTO>> partition = ListUtils.partition(customerAgencyInfos, NumConstant.ONE_HUNDRED);
-                        for (List<DimAgencyDTO> p : partition) {
-                            List<AgencyGroupDailyResultDTO> agencyGroupDaily = this.getAgencyGroupDaily(p, dimIdBean, customerId);
-                            factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily, customerId,status);
-                            status = false;
-                        }
+                        List<AgencyGroupDailyResultDTO> agencyGroupDaily = this.getAgencyGroupDaily(customerAgencyInfos, dimIdBean, customerId);
+                        factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily, customerId);
                     } catch (Exception e) {
                         log.error(String.format(GroupConstant.STATS_FAILED_AGENCY_DAILY, customerId, LocalDate.now(), e));
                     }
@@ -180,7 +175,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
     }
 
     /**
-     * @param customerAgencyInfos
+     * @param agencyList
      * @param timeDim
      * @param customerId
      * @Description 网格小组 【机关-日】 数据统计处理

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java

@@ -101,7 +101,7 @@ public interface FactGroupAgencyDailyService extends BaseService<FactGroupAgency
      * @param agencyList
      * @author zxc
      */
-    void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId,Boolean status);
+    void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId);
 
     /**
      * @param

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java

@@ -113,15 +113,12 @@ public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupAg
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId,Boolean status) {
+    public void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId) {
         if (!CollectionUtils.isEmpty(agencyList)){
-            // true 为当前客户第一回进入,需要删除历史数据
-            if (status){
-                Integer delNum;
-                do {
-                    delNum = baseDao.deleteInsertAgencyDailyByDateId(agencyList.get(NumConstant.ZERO).getDateId(),customerId);
-                }while (delNum > NumConstant.ZERO && delNum == NumConstant.ONE_THOUSAND);
-            }
+            Integer delNum;
+            do {
+                delNum = baseDao.deleteInsertAgencyDailyByDateId(agencyList.get(NumConstant.ZERO).getDateId(),customerId);
+            }while (delNum > NumConstant.ZERO && delNum == NumConstant.ONE_THOUSAND);
             List<List<AgencyGroupDailyResultDTO>> partition = ListUtils.partition(agencyList, NumConstant.ONE_HUNDRED);
             partition.forEach(p -> {
                 baseDao.insertGroupAgencyDaily(p);

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/DailyStatisticalVoteJobResultDTO.java

@@ -17,6 +17,7 @@ public class DailyStatisticalVoteJobResultDTO implements Serializable {
     private static final long serialVersionUID = 5266996778036448163L;
 
     private String issueId;
+    private String customerId;
 
     /**
      * 统计日期

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java

@@ -390,7 +390,7 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
         Integer delNum;
         do {
             delNum = baseDao.delHistoryData(customerId, dateId);
-        } while (delNum != null && delNum > NumConstant.ZERO);
+        } while (delNum == 1000 && delNum > NumConstant.ZERO);
         List<List<IssueVoteStatisticalDailyEntity>> partition = ListUtils.partition(needInsert, NumConstant.ONE_HUNDRED);
         partition.forEach(p -> {
             baseDao.insertBatch(p);

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml

@@ -195,6 +195,7 @@
                t.* FROM
         (SELECT
             vd.ISSUE_ID,
+            vd.CUSTOMER_ID AS customerId,
             COUNT(CASE WHEN vd.ATTITUDE = 'opposition' THEN 1 END) AS oppositionCount,
             COUNT(CASE WHEN vd.ATTITUDE = 'opposition' THEN 1 END) AS oppositionIncrement,
             COUNT(CASE WHEN vd.ATTITUDE = 'support' THEN 1 END) AS supportCount,

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml

@@ -147,7 +147,7 @@
 
                     votable_count,
 
-
+                    customer_id,
 
                     created_by,
 
@@ -180,7 +180,7 @@
 
                     #{item.votableCount},
 
-
+                    #{item.customerId},
 
                     #{item.createdBy},