From ebc623ff1dd66cafdc4437eabae9d0bba0a2ed7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Mon, 26 Feb 2024 16:08:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4pms=E5=9B=BD=E7=BD=91?=
 =?UTF-8?q?=E4=B8=BB=E9=85=8D=E7=BD=91=E7=9B=91=E6=B5=8B=E7=82=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../send/impl/PqTypicalSourceCreatePOServiceImpl.java        | 5 +++--
 .../service/upload/impl/PointStatisticalDataServiceImpl.java | 3 ++-
 .../service/upload/impl/REvaluationDataServiceImpl.java      | 3 ++-
 .../upload/impl/RSubstationStatisticalDataServiceImpl.java   | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
index 73b037318..5d8f339ae 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
@@ -29,9 +29,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
- * 
+ *
  * Description:
  * Date: 2023/12/12  15:16【需求编号】
  *
@@ -115,7 +116,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
             list = this.lambdaQuery()
                     .eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
                     .eq(PqTypicalSourceCreatePO::getIsUploadHead,0)
-                    .eq(PqTypicalSourceCreatePO::getStatisticalLevel,"3")
+                    .in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
                     .list();
         }
         List<PqTypicalSourceCreateDTO> dtoList = BeanUtil.copyToList(list, PqTypicalSourceCreateDTO.class);
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
index bd69d2a78..c90cb59e2 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author xuyang
@@ -77,7 +78,7 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
             list = this.lambdaQuery()
                     .eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
                     .eq(RUploadPointStatisticalDataD::getUploadStatus,0)
-                    .eq(RUploadPointStatisticalDataD::getStatisticalLevel,"3")
+                    .in(RUploadPointStatisticalDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
                     .list();
         }
         List<MonitorStatisticalDTO> dtoList = BeanUtil.copyToList(list, MonitorStatisticalDTO.class);
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
index ebbd12dfc..7d419c491 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
@@ -36,6 +36,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -101,7 +102,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
             list = this.lambdaQuery()
                     .eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
                     .eq(RUploadEvaluationDataD::getUploadStatus,0)
-                    .eq(RUploadEvaluationDataD::getStatisticalLevel,"3")
+                    .in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
                     .list();
         }
         List<PqEvaluationCreateDTO> dtoList = BeanUtil.copyToList(list, PqEvaluationCreateDTO.class);
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
index 179943120..75623ff5f 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
@@ -83,7 +83,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
                     .eq(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getTime())
                     .eq(RUploadSubstationStatisticalDataD::getUploadStatus,0)
                     .eq(RUploadSubstationStatisticalDataD::getCityId,"")
-                    .eq(RUploadSubstationStatisticalDataD::getCountyId,"")
+                    //.eq(RUploadSubstationStatisticalDataD::getCountyId,"")
                     .list();
         }
         //处理时间