From 431c7c03d0c044a3fee3392c7b677581a7c41e9d Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Mon, 11 Mar 2024 18:57:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97PMS=E7=AE=97=E6=B3=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/upload/impl/PointStatisticalDataServiceImpl.java    | 2 ++
 .../service/upload/impl/REvaluationDataServiceImpl.java         | 2 ++
 2 files changed, 4 insertions(+)

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 006283dcc..87e774b01 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
@@ -147,6 +147,8 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
     private String formatBeginMonth(String searchBeginTime, String dataType) {
         if (Objects.equals(dataType, "02")) {
             return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_MONTH_PATTERN);
+        } else if (Objects.equals(dataType, "01")){
+            return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_YEAR_PATTERN)), DatePattern.NORM_YEAR_PATTERN);
         }
         return searchBeginTime;
     }
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 d094d8dd0..ba9e9bc09 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
@@ -191,6 +191,8 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
     private String formatBeginMonth(String searchBeginTime, String dataType) {
         if (Objects.equals(dataType, "02")) {
             return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_MONTH_PATTERN);
+        } else if (Objects.equals(dataType, "01")){
+            return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_YEAR_PATTERN)), DatePattern.NORM_YEAR_PATTERN);
         }
         return searchBeginTime;
     }