From 471e7d6d238e22308e0457aa03c8f8ff62cd6340 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 07 九月 2022 17:37:16 +0800
Subject: [PATCH] 统计接口fix
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java
index 2395704..5cff798 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java
@@ -50,6 +50,7 @@
incidentManageCountRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
incidentManageCountRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
incidentManageCountRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ incidentManageCountRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleTimeData(incidentManageCountRPCResp, query);
@@ -81,6 +82,7 @@
incidentManageCountRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
incidentManageCountRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
incidentManageCountRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ incidentManageCountRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleTimeData(incidentManageCountRPCResp, query);
list.add(incidentManageCountRPCResp);
@@ -108,13 +110,16 @@
Long deptId = incidentManageRPCResp.getDeptId();
String startTime;
String endTime;
+ Integer distType;
if (query.getMonth() == null) {
+ distType=1;
// 查该年度12个月份的
startTime = TimeUtils.getYearFirst(query.getYear());
endTime = TimeUtils.getYearLast(query.getYear());
accidentReportCountRPCList= accidentReportInfoService.getCountForRPCByDeptIdAndMonth(startTime, endTime, deptId);
} else {
+ distType=2;
// 查该年度指定月份的
startTime = TimeUtils.getMonthFirst(query.getYear(), query.getMonth());
endTime = TimeUtils.getMonthLast(query.getYear(), query.getMonth());
@@ -129,6 +134,16 @@
for (Integer integer : timeSET) {
IncidentManageCountRPCResp incidentManageCountRPCResp = new IncidentManageCountRPCResp();
incidentManageCountRPCResp.setTime(integer);
+ incidentManageCountRPCResp.setYear(query.getYear());
+ incidentManageCountRPCResp.setDistType(distType);
+ if (distType==1){
+ incidentManageCountRPCResp.setMonth(integer);
+ }
+ if (distType==2){
+ incidentManageCountRPCResp.setMonth(query.getMonth());
+ incidentManageCountRPCResp.setDay(integer);
+ }
+
incidentManageCountRPCResp.setDetail(new ArrayList<>());
resList.add(incidentManageCountRPCResp);
}
--
Gitblit v1.9.2