From 4bb08dd0399b3d7d034e72a3748e6676e2fc0398 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期五, 19 八月 2022 10:44:28 +0800
Subject: [PATCH] 修改配置文件
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
index e8b214c..76c3610 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
@@ -1,11 +1,9 @@
package com.gkhy.safePlatform.emergency.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gkhy.safePlatform.commons.enums.E;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
-import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
@@ -30,7 +28,6 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -244,29 +241,28 @@
Integer days = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteIntervalTime();
emergencyDrillExecuteCountRespDTO.setDays(days);
-
- List<EmergencyDrillExecuteCountChart> list = new ArrayList<>();
+ // 根据时间、级别获取统计
+ List<EmergencyDrillExecuteCountData> list = new ArrayList<>();
EmergencyDrillExecuteRPCDBQuery dbQuery = new EmergencyDrillExecuteRPCDBQuery();
dbQuery.setLevel(query.getLevel());
- // 根据时间、级别获取统计
- Calendar calendar = Calendar.getInstance();
- int year = calendar.get(Calendar.YEAR);
if (query.getType()==1){
// 月
- int month = calendar.get(Calendar.MONTH);
+ int year = query.getYear();
+ int month = query.getMonth();
dbQuery.setStartTime(TimeUtils.getMonthFirst(year,month));
dbQuery.setEndTime(TimeUtils.getMonthLast(year,month));
list = emergencyDrillExecuteInfoService.selectByMouthTimeAndType(dbQuery);
}
if (query.getType()==2){
// 年
+ int year = query.getYear();
dbQuery.setStartTime(TimeUtils.getYearFirst(year));
dbQuery.setEndTime(TimeUtils.getYearLast(year));
list = emergencyDrillExecuteInfoService.selectByYearTimeAndType(dbQuery);
}
if (!CollectionUtils.isEmpty(list)){
- List<EmergencyDrillExecuteCountChartRespDTO> dataList = BeanCopyUtils.copyBeanList(list,EmergencyDrillExecuteCountChartRespDTO.class);
+ List<EmergencyDrillExecuteCountDataRespDTO> dataList = BeanCopyUtils.copyBeanList(list,EmergencyDrillExecuteCountDataRespDTO.class);
emergencyDrillExecuteCountRespDTO.setDataList(dataList);
}else{
emergencyDrillExecuteCountRespDTO.setDataList(new ArrayList<>());
--
Gitblit v1.9.2