From 0405d15e79bcb62cfe737e5f3f618f7aa34855f0 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 10 十月 2023 14:57:30 +0800
Subject: [PATCH] 报警

---
 ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java b/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
index b2f51a8..2275bda 100644
--- a/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
@@ -212,67 +212,67 @@
     @Override
     public List<CountVo> stealelecMonth(ESParam esParam) {
         List<CountVo> list = stealelecMapper.stealelecMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> cameraMonth(ESParam esParam) {
         List<CountVo> list = cameraMapper.cameraMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> moveMonth(ESParam esParam) {
         List<CountVo> list = moveMapper.moveMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> fireMonth(ESParam esParam) {
         List<CountVo> list = fireMapper.fileMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> externalMonth(ESParam esParam) {
         List<CountVo> list = externalMapper.externalMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> accessMonth(ESParam esParam) {
         List<CountVo> list = accessMapper.accessMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> apponekeyMonth(ESParam esParam) {
         List<CountVo> list = apponekeyMapper.apponekeyMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> pumpMonth(ESParam esParam) {
         List<CountVo> list = pumpMapper.pumpMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> wallMonth(ESParam esParam) {
         List<CountVo> list = wallMapper.wallMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> digitizationMonth(ESParam esParam) {
         List<CountVo> list = digitization3Mapper.digitizationMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> tubeMonth(ESParam esParam) {
         List<CountVo> list = tubeMapper.tubeMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
@@ -421,10 +421,10 @@
         return countVoList;
     }
 
-    public List<CountVo> esMonth(List<CountVo> list,String end){
+    public List<CountVo> esMonth(List<CountVo> list,ESParam esParam){
         List<CountVo> countVoList = new ArrayList<>();
-        Integer day = Integer.valueOf(end.substring(end.length() - 2));
-        String month = end.substring(5,7);
+        Integer day = Integer.valueOf(esParam.getEnd().substring(esParam.getEnd().length() - 2));
+        Integer month = esParam.getMonth();
         for (int i = 1; i <= day ; i++) {
             CountVo vo = new CountVo();
             String d = month + "-" + i ;

--
Gitblit v1.9.3