From af4600f0e9376e8e64e60aaae32164e573739f54 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Mon, 11 Mar 2024 19:14:58 +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

---
 .../mysql/upload/mapping/RUploadEvaluationDataDMapper.xml      | 3 +++
 .../upload/mapping/RUploadPointStatisticalDataDMapper.xml      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadEvaluationDataDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadEvaluationDataDMapper.xml
index 679ff7284..296de4deb 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadEvaluationDataDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadEvaluationDataDMapper.xml
@@ -27,6 +27,9 @@
         r_upload_evaluation_data_d
     where
         statistical_date between #{startTime} and #{endTime}
+        <if test="type == '01'">
+            and statistical_type = '03'
+        </if>
     group by province_id ,
         province_name ,
         city_id ,
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml
index 7d200a0d4..adf98c9d0 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml
@@ -28,6 +28,9 @@
         r_upload_point_statistical_data_d
     where
         statistical_date between #{startTime} and #{endTime}
+        <if test="type == '01'">
+            and statistical_type = '03'
+        </if>
     group by province_id ,
         province_name ,
         city_id ,