From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
index 5ad92ea..94c034b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
@@ -18,6 +18,7 @@
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteNumRPCReq;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteTimeRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteNumDetailRPCResp;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteNumRPCResp;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteTimeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
@@ -28,7 +29,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import sun.security.pkcs11.wrapper.CK_SSL3_KEY_MAT_OUT;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -53,6 +53,7 @@
emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleTimeData(emergencyExecuteTimeRPCResp);
SearchResultVO searchResultVO = new SearchResultVO<>(
@@ -79,6 +80,7 @@
emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleTimeData(emergencyExecuteTimeRPCResp);
list.add(emergencyExecuteTimeRPCResp);
@@ -119,6 +121,7 @@
emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleNumData(emergencyExecuteNumRPCResp,query);
@@ -147,6 +150,7 @@
emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleNumData(emergencyExecuteNumRPCResp,query);
list.add(emergencyExecuteNumRPCResp);
@@ -173,30 +177,44 @@
List<Map<String,Integer>> mapList = new ArrayList<>();
List<EmergencyDrillExecuteCountRPC> emergencyDrillExecuteCountDataList = new ArrayList<>();
-
String startTime ;
String endTime ;
+ Integer distType;
if (query.getMonth()==null){
+ distType=1;
// 查该年度12个月份的
startTime = TimeUtils.getYearFirst(query.getYear());
endTime = TimeUtils.getYearLast(query.getYear());
emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByMonthAndDeptForIntegerMonth(startTime, endTime, deptIds);
}else{
// 查该年度指定月份的
+ distType=2;
startTime = TimeUtils.getMonthFirst(query.getYear(),query.getMonth());
endTime = TimeUtils.getMonthLast(query.getYear(),query.getMonth());
emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByDayAndDept(startTime, endTime, deptIds);
}
if (!emergencyDrillExecuteCountDataList.isEmpty()){
+ List<EmergencyExecuteNumDetailRPCResp> detailList =new ArrayList<>();
for (EmergencyDrillExecuteCountRPC emergencyDrillExecuteCountRPC : emergencyDrillExecuteCountDataList){
- Map<String ,Integer> map = new HashMap<>();
- // 名称+数据 1如果为查询的是年：返回的name为月份 2如果查询的是月，返回的name为天
- map.put("name",emergencyDrillExecuteCountRPC.getName());
- map.put("num",emergencyDrillExecuteCountRPC.getNum());
- mapList.add(map);
+
+ EmergencyExecuteNumDetailRPCResp emergencyExecuteNumDetailRPCResp = new EmergencyExecuteNumDetailRPCResp();
+
+ emergencyExecuteNumDetailRPCResp.setTime(emergencyDrillExecuteCountRPC.getName());
+ emergencyExecuteNumDetailRPCResp.setDistType(distType);
+ emergencyExecuteNumDetailRPCResp.setYear(query.getYear());
+ if (distType==1){
+ emergencyExecuteNumDetailRPCResp.setMonth(emergencyDrillExecuteCountRPC.getName());
+ }
+ if (distType==2){
+ emergencyExecuteNumDetailRPCResp.setMonth(query.getMonth());
+ emergencyExecuteNumDetailRPCResp.setDay(emergencyDrillExecuteCountRPC.getName());
+ }
+ emergencyExecuteNumDetailRPCResp.setNum(emergencyDrillExecuteCountRPC.getNum());
+ detailList.add(emergencyExecuteNumDetailRPCResp);
}
+ emergencyExecuteNumRPCResp.setDetail(detailList);
}
- emergencyExecuteNumRPCResp.setData(mapList);
+
}
private DepInfoRPCRespDTO getDepInfoByDepId(Long deptId) {
--
Gitblit v1.9.2