From e65d1e51d695ac9cdf80d8a706e70308cebef48e Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Wed, 7 Jun 2023 14:17:25 +0800
Subject: [PATCH] =?UTF-8?q?2023-06-07=2015:07:16=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=83=BD=E8=80=97=E7=BB=9F=E8=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/business/PsdcStatisticsDayMapper.xml   | 6 +++---
 .../resources/mapper/business/PsdcStatisticsMonthMapper.xml | 6 +++---
 .../resources/mapper/business/PsdcStatisticsYearMapper.xml  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml
index ce0d4b8..807dd24 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml
@@ -42,9 +42,9 @@
 
     <!--分页查询指定行数据-->
     <select id="queryAllByLimit" resultMap="PsdcStatisticsDayMap">
-        select
-        day_id,day_date,device_id,device_name,hour_00,hour_01,hour_02,hour_03,hour_04,hour_05,hour_06,hour_07,hour_08,hour_09,hour_10,hour_11,hour_12,hour_13,hour_14,hour_15,hour_16,hour_17,hour_18,hour_19,hour_20,hour_21,hour_22,hour_23
-        from psdc_statistics_day
+        Select
+        day_id,day_date,pd.device_id,pd.device_name,hour_00,hour_01,hour_02,hour_03,hour_04,hour_05,hour_06,hour_07,hour_08,hour_09,hour_10,hour_11,hour_12,hour_13,hour_14,hour_15,hour_16,hour_17,hour_18,hour_19,hour_20,hour_21,hour_22,hour_23
+        From psdc_statistics_day psd Left Join psdc_device pd On pd.device_id = psd.device_id
         <where>
             <if test="deviceId != null and deviceId != ''">
                 and device_id = #{deviceId}
diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml
index 4d599a3..43a05b8 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml
@@ -82,9 +82,9 @@
 
     <!--分页查询指定行数据-->
     <select id="queryAllByLimit" resultMap="PsdcStatisticsMonthMap">
-        select
-        month_id,device_id,device_name,month_date,day_01,day_02,day_03,day_04,day_05,day_06,day_07,day_08,day_09,day_10,day_11,day_12,day_13,day_14,day_15,day_16,day_17,day_18,day_19,day_20,day_21,day_22,day_23,day_24,day_25,day_26,day_27,day_28,day_29,day_30,day_31
-        from psdc_statistics_month
+        Select
+        month_id,pd.device_id,pd.device_name,month_date,day_01,day_02,day_03,day_04,day_05,day_06,day_07,day_08,day_09,day_10,day_11,day_12,day_13,day_14,day_15,day_16,day_17,day_18,day_19,day_20,day_21,day_22,day_23,day_24,day_25,day_26,day_27,day_28,day_29,day_30,day_31
+        From psdc_statistics_month psm Left Join psdc_device pd On pd.device_id = psm.device_id
         <where>
             <if test="deviceId != null and deviceId != ''">
                 and device_id = #{deviceId}
diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml
index 05f715f..1c3212c 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml
@@ -30,9 +30,9 @@
 
     <!--分页查询指定行数据-->
     <select id="queryAllByLimit" resultMap="PsdcStatisticsYearMap">
-        select
-        year_id,device_id,device_name,year_date,month_01,month_02,month_03,month_04,month_05,month_06,month_07,month_08,month_09,month_10,month_11,month_12
-        from psdc_statistics_year
+        Select
+        year_id,pd.device_id,pd.device_name,year_date,month_01,month_02,month_03,month_04,month_05,month_06,month_07,month_08,month_09,month_10,month_11,month_12
+        From psdc_statistics_year psy Left Join psdc_device pd On pd.device_id = psy.device_id
         <where>
             <if test="deviceId != null and deviceId != ''">
                 and device_id = #{deviceId}