From 857d738b56e4801a07521cfde502bd5c0f2bf132 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十二月 2023 11:41:02 +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 |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 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 2bbefd7..2644c82 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="cardNum" jdbcType="VARCHAR" property="cardnum" />
-    <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
+    <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" />
@@ -15,7 +15,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, cardNum, clientNum, 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-->
@@ -32,10 +32,10 @@
 
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel">
     <!--@mbg.generated-->
-    insert into se_cancel (id, cardNum, clientNum, refund,
+    insert into se_cancel (id, cardId, clientId, refund,
       refundType, remarks, `operator`, 
       operateDt)
-    values (#{id,jdbcType=BIGINT}, #{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{refund,jdbcType=FLOAT},
+    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>
@@ -44,11 +44,11 @@
     <!--@mbg.generated-->
     insert into se_cancel
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="cardnum != null">
-        cardNum,
+      <if test="cardid != null">
+        cardId,
       </if>
-      <if test="clientnum != null">
-        clientNum,
+      <if test="clientid != null">
+        clientId,
       </if>
       <if test="refund != null">
         refund,
@@ -67,11 +67,11 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="cardnum != null">
-        #{cardnum,jdbcType=VARCHAR},
+      <if test="cardid != null">
+        #{cardid,jdbcType=BIGINT},
       </if>
-      <if test="clientnum != null">
-        #{clientnum,jdbcType=VARCHAR},
+      <if test="clientid != null">
+        #{clientid,jdbcType=BIGINT},
       </if>
       <if test="refund != null">
         #{refund,jdbcType=FLOAT},
@@ -94,11 +94,11 @@
     <!--@mbg.generated-->
     update se_cancel
     <set>
-      <if test="cardnum != null">
-        cardNum = #{cardnum,jdbcType=VARCHAR},
+      <if test="cardid != null">
+        cardId = #{cardid,jdbcType=BIGINT},
       </if>
-      <if test="clientnum != null">
-        clientNum = #{clientnum,jdbcType=VARCHAR},
+      <if test="clientid != null">
+        clientId = #{clientid,jdbcType=BIGINT},
       </if>
       <if test="refund != null">
         refund = #{refund,jdbcType=FLOAT},
@@ -121,8 +121,8 @@
   <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel">
     <!--@mbg.generated-->
     update se_cancel
-    set cardNum = #{cardnum,jdbcType=VARCHAR},
-      clientNum = #{clientnum,jdbcType=VARCHAR},
+    set cardId = #{cardid,jdbcType=BIGINT},
+      clientId = #{clientid,jdbcType=BIGINT},
       refund = #{refund,jdbcType=FLOAT},
       refundType = #{refundtype,jdbcType=TINYINT},
       remarks = #{remarks,jdbcType=VARCHAR},
@@ -136,9 +136,9 @@
     SELECT
         COUNT(*) AS recordCount
     FROM se_cancel can
-        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
+      INNER JOIN se_client_card card ON can.cardId = card.id
+      INNER JOIN se_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},'%')
@@ -159,18 +159,18 @@
     SELECT
         (@i:=@i+1) AS id,
         cli.`name` AS clientName,
-        cli.num AS clientNum,
+        cli.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.cardNum = card.cardNum
-        INNER JOIN ba_client cli ON can.clientNum = cli.num
+        INNER JOIN se_client_card card ON can.cardId = card.id
+        INNER JOIN se_client cli ON can.clientId = cli.id
         , (SELECT @i:=0) AS itable
     <where>
       <if test = "clientName != null and clientName !=''">

--
Gitblit v1.8.0