From 6aa342cc662b3bfb81c3f58b6e6890a7c420ac23 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 14 十二月 2023 11:24:00 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 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..0642219 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,37 @@
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" 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="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock" useGeneratedKeys="true">-->
+<!-- <!–@mbg.generated–>-->
+<!-- insert into se_unlock (cardId, clientId, money, -->
+<!-- remarks, `operator`, operateDt-->
+<!-- )-->
+<!-- values (#{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 +76,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 +101,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 +123,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,9 +135,9 @@
<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 ba_client cli ON unl.clientId = cli.id
, (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
@@ -123,24 +149,24 @@
</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
+ (@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_unlock unl
+ INNER JOIN se_client_card card ON unl.cardId = card.id
+ INNER JOIN ba_client cli ON unl.clientId = cli.id
, (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
@@ -152,7 +178,7 @@
</if>
<if test = "unlocklTimeStart != null and unlockTimeStop != null">
- AND card.unlockDt BETWEEN #{unlocklTimeStart} AND #{unlockTimeStop}
+ AND unl.operateDt BETWEEN #{unlocklTimeStart} AND #{unlockTimeStop}
</if>
</where>
--
Gitblit v1.8.0