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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -418,6 +418,23 @@ public class DateUtils {
         return DateUtils.format(date,DateUtils.DATE_PATTERN_YYYYMMDD);
     }
 
+    public static String getMonthDay(String month){
+        SimpleDateFormat sdf = new SimpleDateFormat(DATE_PATTERN_YYYYMM);
+        String now = sdf.format(new Date());//当前时间
+        if (month.equals(now)) {
+            Calendar c = Calendar.getInstance();
+            c.add(Calendar.DATE, - NumConstant.ONE);
+            Date date = c.getTime();
+            return DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD);
+        }
+        Date nowDate = parse(month, DATE_PATTERN_YYYYMM);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(nowDate);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        return DateUtils.format(calendar.getTime(), DateUtils.DATE_PATTERN_YYYYMMDD);
+
+    }
+
     /**
      * @return java.lang.String
      * @param beforDay

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/PartyMemberVanguardFormDTO.java

@@ -16,4 +16,8 @@ public class PartyMemberVanguardFormDTO implements Serializable {
 	private String orgId;
 	private String orgType;
 	private String dateId;
+	/**
+	 * 月份是当月取前一天，不是当月取那个月最后一天
+	 */
+	private String monthId;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/BranchConAnalysisFormDTO.java

@@ -41,4 +41,8 @@ public class BranchConAnalysisFormDTO implements Serializable {
     private String orgType;
 
     private String dateId;
+    /**
+     * 月份是当月取前一天，不是当月取那个月最后一天
+     */
+    private String monthId;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java

@@ -47,4 +47,8 @@ public class GroupActRankFormDTO implements Serializable {
     private String rankCode;
 
     private String dateId;
+    /**
+     * 月份是当月取前一天，不是当月取那个月最后一天
+     */
+    private String monthId;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1035,9 +1035,13 @@ public class DataStatsServiceImpl implements DataStatsService {
     @Override
     public PartyMemberVanguardDetailResultDTO vanguardDetail(PartyMemberVanguardFormDTO formDTO) {
         PartyMemberVanguardDetailResultDTO result;
+        if (StringUtils.isNotBlank(formDTO.getMonthId())) {
+            formDTO.setDateId(DateUtils.getMonthDay(formDTO.getMonthId()));
+        } else {
             if (StringUtils.isBlank(formDTO.getDateId())) {
                 formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
             }
+        }
         if (OrgConstant.AGENCY.equals(formDTO.getOrgType())) {
             result = dataStatsDao.selectAgencyVanguardDetail(formDTO.getOrgId(), formDTO.getDateId());
         } else {
@@ -1074,9 +1078,13 @@ public class DataStatsServiceImpl implements DataStatsService {
     public PartyMemberVanguardRankResultDTO vanguardRank(PartyMemberVanguardFormDTO formDTO) {
         //获取组织级别
         DimAgencyEntity agency = dataStatsDao.getAgencyInfo(formDTO.getAgencyId());
+        if (StringUtils.isNotBlank(formDTO.getMonthId())) {
+            formDTO.setDateId(DateUtils.getMonthDay(formDTO.getMonthId()));
+        } else {
             if (StringUtils.isBlank(formDTO.getDateId())) {
                 formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
             }
+        }
         if (null == agency) {
         	return new PartyMemberVanguardRankResultDTO();
 		}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java

@@ -120,9 +120,14 @@ public class ResiGroupServiceImpl implements ResiGroupService {
         if (CollectionUtils.isEmpty(categoryList)) {
             return new BranchConAnalysisResultDTO();
         }
+        if (StringUtils.isNotBlank(formDTO.getMonthId())) {
+            formDTO.setDateId(DateUtils.getMonthDay(formDTO.getMonthId()));
+        } else {
             if (StringUtils.isBlank(formDTO.getDateId())) {
                 formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
             }
+        }
+
         List<FactGroupActDailyDTO> factGroupActDailyDTOList = dataStatsService.branchConAnalysis(formDTO.getCustomerId(), formDTO.getOrgId(), formDTO.getOrgType(),
                 formDTO.getDateId(), formDTO.getFirstCategoryCode());
         /**
@@ -287,9 +292,13 @@ public class ResiGroupServiceImpl implements ResiGroupService {
             return new ArrayList<>();
         }
         List<GroupActRankResultDTO> resultDTOList=new ArrayList<>();
+        if (StringUtils.isNotBlank(formDTO.getMonthId())) {
+            formDTO.setDateId(DateUtils.getMonthDay(formDTO.getMonthId()));
+        } else {
             if (StringUtils.isBlank(formDTO.getDateId())) {
                 formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
             }
+        }
         // 1、根据以及编码查询出二级编码列表
         List<ActCategoryDictDTO> actCategoryDictDTOList=queryActCategoryDictList(formDTO.getCustomerId(),formDTO.getFirstCategoryCode());
         for(OrgInfoCommonDTO orgInfo:orgInfoDTOList){