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/SeCancelMapper.xml | 86 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 30 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 b551e3d..0aee3e7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml
@@ -6,6 +6,7 @@
<!--@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="refund" jdbcType="FLOAT" property="refund" />
<result column="refundType" jdbcType="TINYINT" property="refundtype" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
@@ -14,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardId, refund, refundType, remarks, `operator`, operateDt
+ id, cardId, clientId, refund, refundType, remarks, `operator`, operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -28,21 +29,40 @@
delete from se_cancel
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel" useGeneratedKeys="true">
+
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel">
<!--@mbg.generated-->
- insert into se_cancel (cardId, refund, refundType,
- remarks, `operator`, operateDt
- )
- values (#{cardid,jdbcType=BIGINT}, #{refund,jdbcType=FLOAT}, #{refundtype,jdbcType=TINYINT},
- #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
- )
+ 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>
+
+<!-- <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>
+ <if test="clientid != null">
+ clientId,
</if>
<if test="refund != null">
refund,
@@ -63,6 +83,9 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="cardid != null">
#{cardid,jdbcType=BIGINT},
+ </if>
+ <if test="clientid != null">
+ #{clientid,jdbcType=BIGINT},
</if>
<if test="refund != null">
#{refund,jdbcType=FLOAT},
@@ -88,6 +111,9 @@
<if test="cardid != null">
cardId = #{cardid,jdbcType=BIGINT},
</if>
+ <if test="clientid != null">
+ clientId = #{clientid,jdbcType=BIGINT},
+ </if>
<if test="refund != null">
refund = #{refund,jdbcType=FLOAT},
</if>
@@ -110,6 +136,7 @@
<!--@mbg.generated-->
update se_cancel
set cardId = #{cardid,jdbcType=BIGINT},
+ clientId = #{clientid,jdbcType=BIGINT},
refund = #{refund,jdbcType=FLOAT},
refundType = #{refundtype,jdbcType=TINYINT},
remarks = #{remarks,jdbcType=VARCHAR},
@@ -122,9 +149,9 @@
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
COUNT(*) AS recordCount
- FROM se_client_card card
- INNER JOIN se_cancel cancel ON cancel.cardId = card.id
- INNER JOIN ba_client cli ON card.clientId = cli.id
+ 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
<where>
<if test = "clientName != null and clientName !=''">
@@ -136,30 +163,29 @@
</if>
<if test = "cancelTimeStart != null and cancelTimeStop != null">
- AND card.cancelDt BETWEEN #{cancelTimeStart} AND #{cancelTimeStop}
+ AND can.operateDt BETWEEN #{cancelTimeStart} AND #{cancelTimeStop}
</if>
</where>
</select>
<!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栨敞閿�璁板綍-->
- <select id="getCancels" resultType="com.dy.pipIrrGlobal.pojoSe.VoCancel">
+ <select id="getCancels" resultType="com.dy.pipIrrGlobal.voSe.VoCancel">
SELECT
- (@i:=@i+1) AS id,
- cli.`name` AS clientName,
- cli.id AS clientId,
- card.cardAddr,
- cancel.refund,
- (CASE
- WHEN cancel.refundType = 1 THEN
- "鐜伴噾"
- END) AS refundTypeName,
- cancel.refundType,
- (SELECT `name` FROM ba_user WHERE id = cancel.operator) AS operator,
- cancel.operateDt
- FROM se_client_card card
- INNER JOIN se_cancel cancel ON cancel.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.id AS clientId,
+ card.cardAddr,
+ can.refund,
+ (CASE
+ 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
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
@@ -170,7 +196,7 @@
</if>
<if test = "cancelTimeStart != null and cancelTimeStop != null">
- AND card.cancelDt BETWEEN #{cancelTimeStart} AND #{cancelTimeStop}
+ AND can.operateDt BETWEEN #{cancelTimeStart} AND #{cancelTimeStop}
</if>
</where>
--
Gitblit v1.8.0