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

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

@@ -180,19 +180,19 @@ public class StatsGroupServiceImpl implements StatsGroupService {
     }
 
     /**
-     * @param customerAgencyInfos
+     * @param agencyList
      * @param timeDim
      * @param customerId
      * @Description 网格小组 【机关-日】 数据统计处理
      * @author zxc
      */
-    public List<AgencyGroupDailyResultDTO> getAgencyGroupDaily(List<DimAgencyDTO> customerAgencyInfos, DimIdGenerator.DimIdBean timeDim, String customerId) {
+    public List<AgencyGroupDailyResultDTO> getAgencyGroupDaily(List<DimAgencyDTO> agencyList, DimIdGenerator.DimIdBean timeDim, String customerId) {
-        if (customerAgencyInfos.size() == NumConstant.ZERO) {
+        if (CollectionUtils.isEmpty(agencyList)) {
             return new ArrayList<>();
         }
         List<AgencyGroupDailyResultDTO> result = new ArrayList<>();
         String dateId = timeDim.getDateId();
-        List<DimAgencyEntity> agencyList = dimAgencyService.getAgencyListByCustomerId(customerId);
+//        List<DimAgencyEntity> agencyList = dimAgencyService.getAgencyListByCustomerId(customerId);
         agencyList.forEach(agency -> {
             AgencyGroupDailyResultDTO agencyResult = new AgencyGroupDailyResultDTO();
             String agencyId = agency.getId();

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,