From ed5b2e85171b82f2778b7008fe7bba94dec681d8 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 八月 2024 14:50:01 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml | 125 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 119 insertions(+), 6 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 5b247fb..ff1f3fa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
@@ -211,10 +211,10 @@
</if>
</where>
ORDER BY riad.id DESC
-<!-- <if test="pageCurr != null and pageSize != null">-->
-<!-- LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}-->
-<!-- </if>-->
- <trim prefix="limit " >
+ <!-- <if test="pageCurr != null and pageSize != null">-->
+ <!-- LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}-->
+ <!-- </if>-->
+ <trim prefix="limit ">
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
</if>
@@ -234,7 +234,12 @@
<select id="getDayIntakeAmountCount" resultType="java.lang.Long">
SELECT COUNT(*) AS recordCount
FROM pr_intake inta
- WHERE inta.deleted = 0
+ <where>
+ AND inta.deleted = 0
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name = #{intakeNum}
+ </if>
+ </where>
</select>
<!--缁熻鎸囧畾鏈堜唤鍚勫ぉ鐢ㄦ按閲�-->
@@ -428,7 +433,115 @@
AND MONTH(intaDay.dt) = #{month}
AND DAY(intaDay.dt) = 31), 0) AS amount31
FROM pr_intake inta
- WHERE inta.deleted = 0
+ <where>
+ AND inta.deleted = 0
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name = #{intakeNum}
+ </if>
+ </where>
+ ORDER BY inta.id
+ <trim prefix="limit ">
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+ <!--缁熻鎸囧畾骞翠唤鍚勬湀鐢ㄦ按閲忚褰曟暟閲�-->
+ <select id="getMonthIntakeAmountCount" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM pr_intake inta
+ <where>
+ AND inta.deleted = 0
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name = #{intakeNum}
+ </if>
+ </where>
+ </select>
+
+ <!--缁熻鎸囧畾骞翠唤鍚勬湀鐢ㄦ按閲�-->
+ <select id="getMonthIntakeAmount" resultType="com.dy.pipIrrGlobal.voSt.VoMonthIntakeAmount">
+ SELECT inta.id AS intakeId,
+ inta.name AS intakeNum,
+ IFNULL((SELECT SUM(amount) AS amount
+ FROM rm_intake_amount_day 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ WHERE intaDay.intake_id = inta.id
+ AND YEAR(intaDay.dt) = #{year}
+ AND MONTH(intaDay.dt) = 12
+ GROUP BY(intaDay.intake_id)), 0) AS month12
+ FROM pr_intake inta
+ <where>
+ AND inta.deleted = 0
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name = #{intakeNum}
+ </if>
+ </where>
ORDER BY inta.id
<trim prefix="limit ">
<if test="start != null and count != null">
--
Gitblit v1.8.0