From c60767599cf741fde1cb7a10544d8c0ebb8db6a5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 八月 2024 19:36:33 +0800
Subject: [PATCH] 2024-08-08 朱宝民 统计指定月份各天漏算了、统计指定年份各月漏算量
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
index ff1f3fa..c68b2b7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
@@ -247,187 +247,187 @@
SELECT inta.id AS intakeId,
inta.name AS intakeNum,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 1), 0) AS amount1,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 2), 0) AS amount2,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 3), 0) AS amount3,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 4), 0) AS amount4,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 5), 0) AS amount5,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 6), 0) AS amount6,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 7), 0) AS amount7,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 8), 0) AS amount8,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 9), 0) AS amount9,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 10), 0) AS amount10,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 11), 0) AS amount11,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 12), 0) AS amount12,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 13), 0) AS amount13,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 14), 0) AS amount14,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 15), 0) AS amount15,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 16), 0) AS amount16,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 17), 0) AS amount17,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 18), 0) AS amount18,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 19), 0) AS amount19,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 20), 0) AS amount20,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 21), 0) AS amount21,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 22), 0) AS amount22,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 23), 0) AS amount23,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 24), 0) AS amount24,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 25), 0) AS amount25,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 26), 0) AS amount26,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 27), 0) AS amount27,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 28), 0) AS amount28,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 29), 0) AS amount29,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 30), 0) AS amount30,
IFNULL((SELECT IFNULL(amount, 0)
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = #{month}
@@ -460,77 +460,77 @@
</select>
<!--缁熻鎸囧畾骞翠唤鍚勬湀鐢ㄦ按閲�-->
- <select id="getMonthIntakeAmount" resultType="com.dy.pipIrrGlobal.voSt.VoMonthIntakeAmount">
+ <select id="getMonthIntakeAmount" resultType="com.dy.pipIrrGlobal.voSt.VoMonthAmount">
SELECT inta.id AS intakeId,
inta.name AS intakeNum,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 1
GROUP BY(intaDay.intake_id)), 0) AS month1,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 2
GROUP BY(intaDay.intake_id)), 0) AS month2,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 3
GROUP BY(intaDay.intake_id)), 0) AS month3,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 4
GROUP BY(intaDay.intake_id)), 0) AS month4,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 5
GROUP BY(intaDay.intake_id)), 0) AS month5,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 6
GROUP BY(intaDay.intake_id)), 0) AS month6,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 7
GROUP BY(intaDay.intake_id)), 0) AS month7,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 8
GROUP BY(intaDay.intake_id)), 0) AS month8,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 9
GROUP BY(intaDay.intake_id)), 0) AS month9,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 10
GROUP BY(intaDay.intake_id)), 0) AS month10,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 11
GROUP BY(intaDay.intake_id)), 0) AS month11,
IFNULL((SELECT SUM(amount) AS amount
- FROM rm_intake_amount_day intaDay
+ FROM rm_intake_amount_day_last intaDay
WHERE intaDay.intake_id = inta.id
AND YEAR(intaDay.dt) = #{year}
AND MONTH(intaDay.dt) = 12
--
Gitblit v1.8.0