From 92b34ccba2a1b8e68a4f9d2a2d2372fc88f1e987 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Wed, 7 Jun 2023 14:37:14 +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 --- .../main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java | 3 +-- .../java/com/psdc/mapper/PsdcStatisticsMonthMapper.java | 3 +-- .../main/java/com/psdc/mapper/PsdcStatisticsYearMapper.java | 3 +-- .../resources/mapper/business/PsdcStatisticsDayMapper.xml | 6 +++--- .../resources/mapper/business/PsdcStatisticsMonthMapper.xml | 6 +++--- .../resources/mapper/business/PsdcStatisticsYearMapper.xml | 6 +++--- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java index a283222..b5be0b9 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java @@ -25,8 +25,7 @@ public interface PsdcStatisticsDayMapper{ /** * 分页查询指定行数据 * - * @param psdcStatisticsDay 查询条件 - * @param pageable 分页对象 + * @param energyStatisticsRequest 查询条件 * @return 对象列表 */ List queryAllByLimit(EnergyStatisticsRequest energyStatisticsRequest); diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsMonthMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsMonthMapper.java index d7fb79b..793df34 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsMonthMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsMonthMapper.java @@ -26,8 +26,7 @@ public interface PsdcStatisticsMonthMapper{ /** * 分页查询指定行数据 * - * @param psdcStatisticsMonth 查询条件 - * @param pageable 分页对象 + * @param energyStatisticsRequest 查询条件 * @return 对象列表 */ List queryAllByLimit(EnergyStatisticsRequest energyStatisticsRequest); diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsYearMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsYearMapper.java index 965d4fc..25614a1 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsYearMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsYearMapper.java @@ -26,8 +26,7 @@ public interface PsdcStatisticsYearMapper{ /** * 分页查询指定行数据 * - * @param psdcStatisticsYear 查询条件 - * @param pageable 分页对象 + * @param energyStatisticsRequest 查询条件 * @return 对象列表 */ List queryAllByLimit(EnergyStatisticsRequest energyStatisticsRequest); diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml index 807dd24..466ce91 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml @@ -47,13 +47,13 @@ From psdc_statistics_day psd Left Join psdc_device pd On pd.device_id = psd.device_id - and device_id = #{deviceId} + And psd.device_id = #{deviceId} - AND date_format(day_date,'%Y-%m-%d') >= #{startTime} + And date_format(day_date,'%Y-%m-%d') >= #{startTime} - AND date_format(day_date,'%Y-%m-%d') <= #{endTime} + And date_format(day_date,'%Y-%m-%d') <= #{endTime} diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml index 43a05b8..6fbb8fb 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml @@ -87,15 +87,15 @@ From psdc_statistics_month psm Left Join psdc_device pd On pd.device_id = psm.device_id - and device_id = #{deviceId} + And psm.device_id = #{deviceId} - AND date_format(month_date,'%Y-%m') >= #{startTime} + And date_format(month_date,'%Y-%m') >= #{startTime} - AND date_format(month_date,'%Y-%m') <= #{endTime} + And date_format(month_date,'%Y-%m') <= #{endTime} diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml index 1c3212c..8642460 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml @@ -35,15 +35,15 @@ From psdc_statistics_year psy Left Join psdc_device pd On pd.device_id = psy.device_id - and device_id = #{deviceId} + And psy.device_id = #{deviceId} - AND date_format(year_date,'%Y') >= #{startTime} + And date_format(year_date,'%Y') >= #{startTime} - AND date_format(year_date,'%Y') <= #{endTime} + And date_format(year_date,'%Y') <= #{endTime}