Browse Source

Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp

dev_shibei_match
jianjun 5 years ago
parent
commit
88e9dea55a
  1. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java

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

@ -66,7 +66,7 @@ public class StatsIssueServiceImpl implements StatsIssueService {
do { do {
//如果不是空则,获取当前日期前一天 //如果不是空则,获取当前日期前一天
Date date = null; Date date = null;
if (StringUtils.isEmpty(formDTO.getDate())) { if (!StringUtils.isEmpty(formDTO.getDate())) {
date = DateUtils.stringToDate(formDTO.getDate(), DateUtils.DATE_PATTERN); date = DateUtils.stringToDate(formDTO.getDate(), DateUtils.DATE_PATTERN);
} else { } else {
date = DateUtils.getBeforeDay(new Date()); date = DateUtils.getBeforeDay(new Date());

Loading…
Cancel
Save