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/SeCancelMapper.xml | 90 +++++++++++++++++++--------------------------
1 files changed, 38 insertions(+), 52 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml
index 0aee3e7..2bbefd7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml
@@ -5,8 +5,8 @@
<!--@mbg.generated-->
<!--@Table se_cancel-->
<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="refund" jdbcType="FLOAT" property="refund" />
<result column="refundType" jdbcType="TINYINT" property="refundtype" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
@@ -15,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardId, clientId, refund, refundType, remarks, `operator`, operateDt
+ id, cardNum, clientNum, refund, refundType, remarks, `operator`, operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -30,39 +30,25 @@
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel">
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel">
<!--@mbg.generated-->
- insert into se_cancel (id, cardId, clientId, refund, refundType, remarks, `operator`, operateDt)
- values (#{id,jdbcType=BIGINT},
- #{cardid,jdbcType=BIGINT},
- #{clientid,jdbcType=BIGINT},
- #{refund,jdbcType=FLOAT},
- #{refundtype,jdbcType=TINYINT},
- #{remarks,jdbcType=VARCHAR},
- #{operator,jdbcType=BIGINT},
- #{operatedt,jdbcType=TIMESTAMP})
+ insert into se_cancel (id, cardNum, clientNum, refund,
+ refundType, remarks, `operator`,
+ operateDt)
+ values (#{id,jdbcType=BIGINT}, #{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{refund,jdbcType=FLOAT},
+ #{refundtype,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
+ #{operatedt,jdbcType=TIMESTAMP})
</insert>
-
-<!-- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel" useGeneratedKeys="true">-->
-<!-- <!–@mbg.generated–>-->
-<!-- insert into se_cancel (cardId, clientId, refund, -->
-<!-- refundType, remarks, `operator`, -->
-<!-- operateDt)-->
-<!-- values (#{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{refund,jdbcType=FLOAT}, -->
-<!-- #{refundtype,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, -->
-<!-- #{operatedt,jdbcType=TIMESTAMP})-->
-<!-- </insert>-->
-
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into se_cancel
<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="refund != null">
refund,
@@ -81,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="refund != null">
#{refund,jdbcType=FLOAT},
@@ -108,11 +94,11 @@
<!--@mbg.generated-->
update se_cancel
<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="refund != null">
refund = #{refund,jdbcType=FLOAT},
@@ -135,8 +121,8 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel">
<!--@mbg.generated-->
update se_cancel
- set cardId = #{cardid,jdbcType=BIGINT},
- clientId = #{clientid,jdbcType=BIGINT},
+ set cardNum = #{cardnum,jdbcType=VARCHAR},
+ clientNum = #{clientnum,jdbcType=VARCHAR},
refund = #{refund,jdbcType=FLOAT},
refundType = #{refundtype,jdbcType=TINYINT},
remarks = #{remarks,jdbcType=VARCHAR},
@@ -150,16 +136,16 @@
SELECT
COUNT(*) AS recordCount
FROM se_cancel can
- INNER JOIN se_client_card card ON can.cardId = card.id
- INNER JOIN ba_client cli ON can.clientId = cli.id
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client_card card ON can.cardNum = card.cardNum
+ INNER JOIN ba_client cli ON can.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 = "cancelTimeStart != null and cancelTimeStop != null">
@@ -173,33 +159,33 @@
SELECT
(@i:=@i+1) AS id,
cli.`name` AS clientName,
- cli.id AS clientId,
- card.cardAddr,
+ cli.num AS clientNum,
+ card.cardNum,
can.refund,
(CASE
- WHEN can.refundType = 1 THEN "鐜伴噾"
+ WHEN can.refundType = 1 THEN "鐜伴噾"
END) AS refundTypeName,
can.refundType,
(SELECT `name` FROM ba_user WHERE id = can.operator) AS operator,
can.operateDt
FROM se_cancel can
- INNER JOIN se_client_card card ON can.cardId = card.id
- INNER JOIN ba_client cli ON can.clientId = cli.id
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client_card card ON can.cardNum = card.cardNum
+ INNER JOIN ba_client cli ON can.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 = "cancelTimeStart != null and cancelTimeStop != null">
AND can.operateDt BETWEEN #{cancelTimeStart} AND #{cancelTimeStop}
</if>
</where>
-
+ ORDER BY can.operateDt DESC
<if test="pageCurr != null and pageSize != null">
LIMIT ${pageCurr}, ${pageSize}
</if>
--
Gitblit v1.8.0