From b8470f5e90d0aed22bf2c4bf9f5d2a13cd60b15f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 十二月 2024 14:03:41 +0800
Subject: [PATCH] 1、统计模块实现农户日用水量纵转横转存,月、年用水量统计; 2、临时模块农户日用水量纵转横转存,月、年用水量统计;

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml |   56 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml
index 2e366bf..2027ccd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml
@@ -9,10 +9,11 @@
     <result column="year" jdbcType="INTEGER" property="year" />
     <result column="amount" jdbcType="FLOAT" property="amount" />
     <result column="money" jdbcType="FLOAT" property="money" />
+    <result column="times" jdbcType="INTEGER" property="times" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, client_id, `year`, amount, money
+    id, client_id, `year`, amount, money, times
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -20,19 +21,6 @@
     <include refid="Base_Column_List" />
     from st_client_amount_year
     where id = #{id,jdbcType=BIGINT}
-  </select>
-  <select id="selectByClientIdAndYear" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from st_client_amount_year
-    <where>
-      <if test="clientId != null">
-        and client_id = #{clientId,jdbcType=BIGINT}
-      </if>
-      <if test="year != null">
-        and `year` = #{year,jdbcType=INTEGER}
-      </if>
-    </where>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
@@ -42,9 +30,9 @@
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSt.StClientAmountYear">
     <!--@mbg.generated-->
     insert into st_client_amount_year (id, client_id, `year`, 
-      amount, money)
+      amount, money, times)
     values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{year,jdbcType=INTEGER}, 
-      #{amount,jdbcType=FLOAT}, #{money,jdbcType=FLOAT})
+      #{amount,jdbcType=FLOAT}, #{money,jdbcType=FLOAT}, #{times,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSt.StClientAmountYear">
     <!--@mbg.generated-->
@@ -65,6 +53,9 @@
       <if test="money != null">
         money,
       </if>
+      <if test="times != null">
+        times,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -81,6 +72,9 @@
       </if>
       <if test="money != null">
         #{money,jdbcType=FLOAT},
+      </if>
+      <if test="times != null">
+        #{times,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -100,6 +94,9 @@
       <if test="money != null">
         money = #{money,jdbcType=FLOAT},
       </if>
+      <if test="times != null">
+        times = #{times,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -109,7 +106,32 @@
     set client_id = #{clientId,jdbcType=BIGINT},
       `year` = #{year,jdbcType=INTEGER},
       amount = #{amount,jdbcType=FLOAT},
-      money = #{money,jdbcType=FLOAT}
+      money = #{money,jdbcType=FLOAT},
+      times = #{times,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
+
+
+  <!-- ////////////////////////////////// -->
+  <!-- 缁熻鐩稿叧                         -->
+  <!-- ////////////////////////////////// -->
+  <select id="selectByYear" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from st_client_amount_year
+    <where>
+      <if test="year != null">
+        and `year` = #{year,jdbcType=INTEGER}
+      </if>
+    </where>
+  </select>
+
+
+  <!-- ////////////////////////////////// -->
+  <!-- 涓存椂浠诲姟鐩稿叧                         -->
+  <!-- ////////////////////////////////// -->
+  <delete id="deleteAll">
+    delete from st_client_amount_year
+  </delete>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0