From a30be18fa7896e36943462aef9e9949f0acf7f5e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 14:34:45 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml | 93 ++++++++++++++++++++--------------------------
1 files changed, 40 insertions(+), 53 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml
index 0f5d2e2..03884b2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml
@@ -5,8 +5,8 @@
<!--@mbg.generated-->
<!--@Table se_reversal-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="cardId" jdbcType="BIGINT" property="cardid" />
- <result column="clientId" jdbcType="BIGINT" property="clientid" />
+ <result column="cardNum" jdbcType="VARCHAR" property="cardnum" />
+ <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
<result column="cardBalance" jdbcType="FLOAT" property="cardbalance" />
<result column="systemBalance" jdbcType="FLOAT" property="systembalance" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
@@ -15,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardId, clientId, cardBalance, systemBalance, remarks, `operator`, operateDt
+ id, cardNum, clientNum, cardBalance, systemBalance, remarks, `operator`, operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -30,38 +30,25 @@
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeReversal">
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeReversal">
<!--@mbg.generated-->
- insert into se_reversal (id, cardId, clientId, cardBalance, systemBalance, remarks, `operator`, operateDt)
- values (#{id,jdbcType=BIGINT},
- #{cardid,jdbcType=BIGINT},
- #{clientid,jdbcType=BIGINT},
- #{cardbalance,jdbcType=FLOAT},
- #{systembalance,jdbcType=FLOAT},
- #{remarks,jdbcType=VARCHAR},
- #{operator,jdbcType=BIGINT},
- #{operatedt,jdbcType=TIMESTAMP})
+ insert into se_reversal (id, cardNum, clientNum, cardBalance,
+ systemBalance, remarks, `operator`,
+ operateDt)
+ values (#{id,jdbcType=BIGINT}, #{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{cardbalance,jdbcType=FLOAT},
+ #{systembalance,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
+ #{operatedt,jdbcType=TIMESTAMP})
</insert>
-
-<!-- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeReversal" useGeneratedKeys="true">-->
-<!-- <!–@mbg.generated–>-->
-<!-- insert into se_reversal (cardId, clientId, cardBalance, -->
-<!-- systemBalance, remarks, `operator`, -->
-<!-- operateDt)-->
-<!-- values (#{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{cardbalance,jdbcType=FLOAT}, -->
-<!-- #{systembalance,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, -->
-<!-- #{operatedt,jdbcType=TIMESTAMP})-->
-<!-- </insert>-->
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeReversal" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into se_reversal
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="cardid != null">
- cardId,
+ <if test="cardnum != null">
+ cardNum,
</if>
- <if test="clientid != null">
- clientId,
+ <if test="clientnum != null">
+ clientNum,
</if>
<if test="cardbalance != null">
cardBalance,
@@ -80,11 +67,11 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="cardid != null">
- #{cardid,jdbcType=BIGINT},
+ <if test="cardnum != null">
+ #{cardnum,jdbcType=VARCHAR},
</if>
- <if test="clientid != null">
- #{clientid,jdbcType=BIGINT},
+ <if test="clientnum != null">
+ #{clientnum,jdbcType=VARCHAR},
</if>
<if test="cardbalance != null">
#{cardbalance,jdbcType=FLOAT},
@@ -107,11 +94,11 @@
<!--@mbg.generated-->
update se_reversal
<set>
- <if test="cardid != null">
- cardId = #{cardid,jdbcType=BIGINT},
+ <if test="cardnum != null">
+ cardNum = #{cardnum,jdbcType=VARCHAR},
</if>
- <if test="clientid != null">
- clientId = #{clientid,jdbcType=BIGINT},
+ <if test="clientnum != null">
+ clientNum = #{clientnum,jdbcType=VARCHAR},
</if>
<if test="cardbalance != null">
cardBalance = #{cardbalance,jdbcType=FLOAT},
@@ -134,8 +121,8 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeReversal">
<!--@mbg.generated-->
update se_reversal
- set cardId = #{cardid,jdbcType=BIGINT},
- clientId = #{clientid,jdbcType=BIGINT},
+ set cardNum = #{cardnum,jdbcType=VARCHAR},
+ clientNum = #{clientnum,jdbcType=VARCHAR},
cardBalance = #{cardbalance,jdbcType=FLOAT},
systemBalance = #{systembalance,jdbcType=FLOAT},
remarks = #{remarks,jdbcType=VARCHAR},
@@ -147,22 +134,22 @@
<!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栧啿姝ｈ褰曟暟-->
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
- COUNT(*) AS recordCount
- FROM se_client_card card
- INNER JOIN se_reversal rev ON rev.cardId = card.id
- INNER JOIN ba_client cli ON card.clientId = cli.id
- , (SELECT @i:=0) AS itable
+ COUNT(*) AS recordCount
+ FROM se_reversal rev
+ INNER JOIN se_client_card card ON rev.cardNum = card.cardNum
+ INNER JOIN ba_client cli ON rev.clientNum = cli.num
+ , (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 = "reversallTimeStart != null and reversalTimeStop != null">
- AND card.unlockDt BETWEEN #{reversallTimeStart} AND #{reversalTimeStop}
+ <if test = "reversalTimeStart != null and reversalTimeStop != null">
+ AND rev.operateDt BETWEEN #{reversalTimeStart} AND #{reversalTimeStop}
</if>
</where>
</select>
@@ -172,29 +159,29 @@
SELECT
(@i:=@i+1) AS id,
cli.`name` AS clientName,
- cli.id AS clientId,
- card.cardAddr,
+ cli.num AS clientNum,
+ card.cardNum,
rev.cardBalance,
(SELECT `name` FROM ba_user WHERE id = rev.operator) AS operator,
rev.operateDt
FROM se_reversal rev
- INNER JOIN se_client_card card ON rev.cardId = card.id
- INNER JOIN ba_client cli ON rev.clientId = cli.id
+ INNER JOIN se_client_card card ON rev.cardNum = card.cardNum
+ INNER JOIN ba_client cli ON rev.clientNum = cli.num
, (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 = "reversalTimeStart != null and reversalTimeStop != null">
AND rev.operateDt BETWEEN #{reversalTimeStart} AND #{reversalTimeStop}
</if>
</where>
-
+ ORDER BY rev.operateDt DESC
<if test="pageCurr != null and pageSize != null">
LIMIT ${pageCurr}, ${pageSize}
</if>
--
Gitblit v1.8.0