From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
index f96ab0a..f7aa962 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
@@ -32,17 +32,19 @@
delete from se_active_card
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeActiveCard" useGeneratedKeys="true">
+
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeActiveCard">
<!--@mbg.generated-->
- insert into se_active_card (cardId, clientId, cardCost,
+ insert into se_active_card (id, cardId, clientId, cardCost,
paymentId, reissueAmount, operateType,
remarks, `operator`, operateDt
)
- values (#{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{cardcost,jdbcType=INTEGER},
+ values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{cardcost,jdbcType=INTEGER},
#{paymentid,jdbcType=BIGINT}, #{reissueamount,jdbcType=DOUBLE}, #{operatetype,jdbcType=TINYINT},
#{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
)
</insert>
+
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeActiveCard" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into se_active_card
@@ -159,7 +161,7 @@
SELECT
COUNT(*) AS recordCount
FROM se_active_card act
- INNER JOIN ba_client cli ON act.clientId = cli.id
+ INNER JOIN se_client cli ON act.clientId = cli.id
INNER JOIN se_client_card card ON act.cardId = card.id
, (SELECT @i:=0) AS itable
<where>
@@ -171,8 +173,8 @@
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 = "state != null and state > 0">
@@ -190,23 +192,23 @@
SELECT
(@i:=@i+1) AS id,
cli.`name` AS clientName,
- cli.id AS clientId,
- card.cardAddr,
+ cli.clientNum,
+ card.cardNum,
card.state,
(CASE
WHEN card.state = 1 THEN "姝ｅ父"
WHEN card.state = 2 THEN "宸叉敞閿�"
ELSE "宸叉寕澶�"
END) AS stateName,
- act.reissueAmount,
- act.cardCost,
- act.paymentId,
- (SELECT `name` FROM ba_user WHERE id = act.operator) AS operator,
- act.operateDt
+ act.reissueAmount,
+ act.cardCost,
+ act.paymentId,
+ (SELECT `name` FROM ba_user WHERE id = act.operator) AS operator,
+ act.operateDt
FROM se_active_card act
- INNER JOIN ba_client cli ON act.clientId = cli.id
- INNER JOIN se_client_card card ON act.cardId = card.id
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client cli ON act.clientId = cli.id
+ INNER JOIN se_client_card card ON act.cardId = card.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "operateType != null and operateType > 0">
AND act.operateType = ${operateType}
@@ -216,8 +218,8 @@
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 = "state != null and state > 0">
@@ -228,9 +230,11 @@
AND act.operateDt BETWEEN #{activeTimeStart} AND #{activeTimeStop}
</if>
</where>
-
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ ORDER BY act.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