luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

jianjun 4 years ago
parent
17ee703d6b 1549a7a1f5
commit
0d1aceda1b
3 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
  2. 1
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
  3. 2
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save