Commit 1cc695a9 by 朱淼

fix bug

parent f820623c
...@@ -36,6 +36,8 @@ import jodd.util.StringUtil; ...@@ -36,6 +36,8 @@ import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -65,6 +67,12 @@ public class WorkStationServiceImpl implements WorkStationService { ...@@ -65,6 +67,12 @@ public class WorkStationServiceImpl implements WorkStationService {
@Override @Override
public WorkStationInstitutionStatisticsVO institutionStatistics(WorkStationQueryDTO dto) { public WorkStationInstitutionStatisticsVO institutionStatistics(WorkStationQueryDTO dto) {
WorkStationInstitutionStatisticsVO vo = new WorkStationInstitutionStatisticsVO(); WorkStationInstitutionStatisticsVO vo = new WorkStationInstitutionStatisticsVO();
if(dto.getStartTime() == null){
dto.setStartTime(LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MIN));
}
if(dto.getEndTime() == null){
dto.setEndTime(LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MAX));
}
if (dto.getOrgIds().isEmpty()) { if (dto.getOrgIds().isEmpty()) {
//获取该账号的权限组织 //获取该账号的权限组织
List<PlatOrg> orgs = belongToScopeList(PlatOrgEnum.OrgTypeEnum.INSTITUTION.getValue()); List<PlatOrg> orgs = belongToScopeList(PlatOrgEnum.OrgTypeEnum.INSTITUTION.getValue());
...@@ -268,6 +276,12 @@ public class WorkStationServiceImpl implements WorkStationService { ...@@ -268,6 +276,12 @@ public class WorkStationServiceImpl implements WorkStationService {
@Override @Override
public WorkStationHomeStatisticsVO homeStatistics(WorkStationQueryDTO dto) { public WorkStationHomeStatisticsVO homeStatistics(WorkStationQueryDTO dto) {
if(dto.getStartTime() == null){
dto.setStartTime(LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MIN));
}
if(dto.getEndTime() == null){
dto.setEndTime(LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MAX));
}
WorkStationHomeStatisticsVO vo = new WorkStationHomeStatisticsVO(); WorkStationHomeStatisticsVO vo = new WorkStationHomeStatisticsVO();
if (dto.getOrgIds().isEmpty()) { if (dto.getOrgIds().isEmpty()) {
//获取该账号的权限组织 //获取该账号的权限组织
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment