From 3a6ac2949244e6a3f70e165cd3802f1d90b78819 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 十月 2024 11:20:41 +0800
Subject: [PATCH] 格式化SQL语句

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml |   79 ++++++++++++++++++++++++---------------
 1 files changed, 48 insertions(+), 31 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 39f5d36..c892fa1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
@@ -6,6 +6,7 @@
     <!--@Table se_unlock-->
     <id column="id" jdbcType="BIGINT" property="id" />
     <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" />
@@ -13,7 +14,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, cardId, money, remarks, `operator`, operateDt
+    id, cardId, clientId, money, remarks, `operator`, operateDt
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -27,19 +28,26 @@
     delete from se_unlock
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock" useGeneratedKeys="true">
+
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock">
     <!--@mbg.generated-->
-    insert into se_unlock (cardId, money, remarks, 
-      `operator`, operateDt)
-    values (#{cardid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR}, 
-      #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP})
+    insert into se_unlock (id, cardId, clientId, money,
+      remarks, `operator`, operateDt
+      )
+    values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT},
+      #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
+      )
   </insert>
+
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock" useGeneratedKeys="true">
     <!--@mbg.generated-->
     insert into se_unlock
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="cardid != null">
         cardId,
+      </if>
+      <if test="clientid != null">
+        clientId,
       </if>
       <if test="money != null">
         money,
@@ -57,6 +65,9 @@
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="cardid != null">
         #{cardid,jdbcType=BIGINT},
+      </if>
+      <if test="clientid != null">
+        #{clientid,jdbcType=BIGINT},
       </if>
       <if test="money != null">
         #{money,jdbcType=FLOAT},
@@ -79,6 +90,9 @@
       <if test="cardid != null">
         cardId = #{cardid,jdbcType=BIGINT},
       </if>
+      <if test="clientid != null">
+        clientId = #{clientid,jdbcType=BIGINT},
+      </if>
       <if test="money != null">
         money = #{money,jdbcType=FLOAT},
       </if>
@@ -98,6 +112,7 @@
     <!--@mbg.generated-->
     update se_unlock
     set cardId = #{cardid,jdbcType=BIGINT},
+      clientId = #{clientid,jdbcType=BIGINT},
       money = #{money,jdbcType=FLOAT},
       remarks = #{remarks,jdbcType=VARCHAR},
       `operator` = #{operator,jdbcType=BIGINT},
@@ -109,55 +124,57 @@
   <select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
     SELECT
         COUNT(*) AS recordCount
-    FROM se_client_card card
-    INNER JOIN se_unlock unl ON unl.cardId = card.id
-    INNER JOIN ba_client cli ON	 card.clientId = cli.id
+    FROM se_unlock unl
+    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},'%')
       </if>
 
-      <if test = "cardAddr != null and cardAddr !=''">
-        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+      <if test = "cardNum != null and cardNum !=''">
+        AND card.cardNum like CONCAT('%',#{cardNum},'%')
       </if>
 
       <if test = "unlocklTimeStart != null and unlockTimeStop != null">
-        AND card.unlockDt BETWEEN #{unlocklTimeStart} AND #{unlockTimeStop}
+        AND unl.operateDt BETWEEN #{unlocklTimeStart} AND #{unlockTimeStop}
       </if>
     </where>
   </select>
 
   <!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬В閿佽褰�-->
-  <select id="getUnlocks" resultType="com.dy.pipIrrGlobal.pojoSe.VoUnlock">
+  <select id="getUnlocks" resultType="com.dy.pipIrrGlobal.voSe.VoUnlock">
     SELECT
-      (@i:=@i+1) AS id,
-      cli.`name` AS clientName,
-      cli.id AS clientId,
-      card.cardAddr,
-      unl.money,
-      (SELECT `name` FROM ba_user WHERE id =  unl.operator) AS operator,
-      unl.operateDt
-    FROM se_client_card card
-      INNER JOIN se_unlock unl ON unl.cardId = card.id
-      INNER JOIN ba_client cli ON	 card.clientId = cli.id
-      , (SELECT @i:=0) AS itable
+        (@i:=@i+1) AS id,
+        cli.`name` AS clientName,
+        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.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},'%')
       </if>
 
-      <if test = "cardAddr != null and cardAddr !=''">
-        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+      <if test = "cardNum != null and cardNum !=''">
+        AND card.cardNum like CONCAT('%',#{cardNum},'%')
       </if>
 
       <if test = "unlocklTimeStart != null and unlockTimeStop != null">
-        AND card.unlockDt BETWEEN #{unlocklTimeStart} AND #{unlockTimeStop}
+        AND unl.operateDt BETWEEN #{unlocklTimeStart} AND #{unlockTimeStop}
       </if>
     </where>
-
-    <if test="pageCurr != null and pageSize != null">
-      LIMIT ${pageCurr}, ${pageSize}
-    </if>
+    ORDER BY unl.operateDt DESC
+    <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