Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

@@ -1,5 +1,6 @@
  package com.epmet.dataaggre.service.datastats.impl;
 
+ import com.alibaba.fastjson.JSON;
  import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
  import com.epmet.commons.tools.constant.StrConstant;
@@ -1489,26 +1490,25 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
         String startDate = null;
         String actulStartDate = null;
-        String endDate = null;
+        String endDate = formDTO.getDateId();
         Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD);
         boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId());
         switch (formDTO.getType()){
             case "yesterday":
                 startDate = DateUtils.getBeforeNDay(formDTO.getDateId(),1);
-                endDate = formDTO.getDateId();
                 actulStartDate = formDTO.getDateId();
                 break;
             case "thisWeek":
-                actulStartDate = DateUtils.getWeekStart(formDTO.getDateId());
-                startDate = DateUtils.getBeforeNDay(actulStartDate,1);
-                DateUtils.format(DateUtils.addDateDays(yesterday, -1),DateUtils.DATE_PATTERN_YYYYMMDD);
+                startDate = DateUtils.getWeekStart(formDTO.getDateId());
+                //startDate = DateUtils.getBeforeNDay(actulStartDate,1);
+                //DateUtils.format(DateUtils.addDateDays(yesterday, -1),DateUtils.DATE_PATTERN_YYYYMMDD);
                 if (!isYesterday){
                     endDate = DateUtils.getWeekEnd(formDTO.getDateId());
                 }
                 break;
             case "thisMonth":
-                actulStartDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
-                startDate = DateUtils.getBeforeNDay(actulStartDate,1);
+                startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
+                //startDate = DateUtils.getBeforeNDay(actulStartDate,1);
                 if (!isYesterday) {
                     endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD);
                 }
@@ -1518,6 +1518,7 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
         formDTO.setStartDateId(startDate);
         formDTO.setEndDateId(endDate);
+        log.info("getSubWorkFact do select param:{}", JSON.toJSONString(formDTO));
         List<WorkFactResultDTO> result = new ArrayList<>();
         //如果是社区 则下级是网格 查询网格的数据
         if (OrgLevelEnum.COMMUNITY.getCode().equals(formDTO.getAgencyLevel())){

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

@@ -436,7 +436,6 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                         e.setCustomerId(customerId);
                         finalSonResult.add(e);
                     });
-                    result.addAll(finalSonResult);
                 }
                 // 内部客户与外部客户 相同的分类累加
                 if (!CollectionUtils.isEmpty(categoryProjectExists)){

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -193,7 +193,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 				PartymemberInfoEntity.class);
 		PartymemberInfoDTO info = partymemberInfoService.getPartyMemberInfoByUser(partyMemberInfoDTO.getCustomerId(), partyMemberInfoDTO.getUserId());
 		if (null != info) {
-			partyMemberInfoDTO.setId(info.getId());
+			partyMemberInfoEntity.setId(info.getId());
 		}
 		if (confirmAutoDTO == null || !confirmAutoDTO.getComparisonResults()) {
 			log.info("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO));