From f34dc97df6dc9f4480e7903016f104388ec1a7ab Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 23 五月 2024 11:34:47 +0800
Subject: [PATCH] 田间灌溉项目管理 轮灌组 修改查一个、分页查、轮灌组绑定灌溉单元变物理删除

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml |   60 +++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
index 329661f..c892fa1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
@@ -5,8 +5,8 @@
     <!--@mbg.generated-->
     <!--@Table se_unlock-->
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="cardNum" jdbcType="VARCHAR" property="cardnum" />
-    <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
+    <result column="cardId" jdbcType="BIGINT" property="cardid" />
+    <result column="clientId" jdbcType="BIGINT" property="clientid" />
     <result column="money" jdbcType="FLOAT" property="money" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="operator" jdbcType="BIGINT" property="operator" />
@@ -14,7 +14,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, cardNum, clientNum, money, remarks, `operator`, operateDt
+    id, cardId, clientId, money, remarks, `operator`, operateDt
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -31,10 +31,10 @@
 
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock">
     <!--@mbg.generated-->
-    insert into se_unlock (id, cardNum, clientNum, money,
+    insert into se_unlock (id, cardId, clientId, money,
       remarks, `operator`, operateDt
       )
-    values (#{id,jdbcType=BIGINT}, #{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{money,jdbcType=FLOAT},
+    values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT},
       #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -43,11 +43,11 @@
     <!--@mbg.generated-->
     insert into se_unlock
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="cardnum != null">
-        cardNum,
+      <if test="cardid != null">
+        cardId,
       </if>
-      <if test="clientnum != null">
-        clientNum,
+      <if test="clientid != null">
+        clientId,
       </if>
       <if test="money != null">
         money,
@@ -63,11 +63,11 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="cardnum != null">
-        #{cardnum,jdbcType=VARCHAR},
+      <if test="cardid != null">
+        #{cardid,jdbcType=BIGINT},
       </if>
-      <if test="clientnum != null">
-        #{clientnum,jdbcType=VARCHAR},
+      <if test="clientid != null">
+        #{clientid,jdbcType=BIGINT},
       </if>
       <if test="money != null">
         #{money,jdbcType=FLOAT},
@@ -87,11 +87,11 @@
     <!--@mbg.generated-->
     update se_unlock
     <set>
-      <if test="cardnum != null">
-        cardNum = #{cardnum,jdbcType=VARCHAR},
+      <if test="cardid != null">
+        cardId = #{cardid,jdbcType=BIGINT},
       </if>
-      <if test="clientnum != null">
-        clientNum = #{clientnum,jdbcType=VARCHAR},
+      <if test="clientid != null">
+        clientId = #{clientid,jdbcType=BIGINT},
       </if>
       <if test="money != null">
         money = #{money,jdbcType=FLOAT},
@@ -111,8 +111,8 @@
   <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock">
     <!--@mbg.generated-->
     update se_unlock
-    set cardNum = #{cardnum,jdbcType=VARCHAR},
-      clientNum = #{clientnum,jdbcType=VARCHAR},
+    set cardId = #{cardid,jdbcType=BIGINT},
+      clientId = #{clientid,jdbcType=BIGINT},
       money = #{money,jdbcType=FLOAT},
       remarks = #{remarks,jdbcType=VARCHAR},
       `operator` = #{operator,jdbcType=BIGINT},
@@ -125,9 +125,9 @@
     SELECT
         COUNT(*) AS recordCount
     FROM se_unlock unl
-        INNER JOIN se_client_card card ON unl.cardNum = card.cardNum
-        INNER JOIN ba_client cli ON unl.clientNum = cli.num
-        , (SELECT @i:=0) AS itable
+    INNER JOIN se_client_card card ON unl.cardId = card.id
+    INNER JOIN se_client cli ON unl.clientId = cli.id
+    , (SELECT @i:=0) AS itable
     <where>
       <if test = "clientName != null and clientName !=''">
         AND cli.name like CONCAT('%',#{clientName},'%')
@@ -148,15 +148,15 @@
     SELECT
         (@i:=@i+1) AS id,
         cli.`name` AS clientName,
-        cli.num AS clientNum,
+        cli.clientNum,
         card.cardNum,
         unl.money,
         (SELECT `name` FROM ba_user WHERE id =  unl.operator) AS operator,
         unl.operateDt
     FROM se_unlock unl
-        INNER JOIN se_client_card card ON unl.cardNum = card.cardNum
-        INNER JOIN ba_client cli ON unl.clientNum = cli.num
-        , (SELECT @i:=0) AS itable
+    INNER JOIN se_client_card card ON unl.cardId = card.id
+    INNER JOIN se_client cli ON unl.clientId = cli.id
+    , (SELECT @i:=0) AS itable
     <where>
       <if test = "clientName != null and clientName !=''">
         AND cli.name like CONCAT('%',#{clientName},'%')
@@ -171,8 +171,10 @@
       </if>
     </where>
     ORDER BY unl.operateDt DESC
-    <if test="pageCurr != null and pageSize != null">
-      LIMIT ${pageCurr}, ${pageSize}
-    </if>
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
   </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0