From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug（新生成了记录，应该是更新老记录），修改之 ； 2、CommonV1_0_0中获取开关阀类型名称时，对于null返回空字符串。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml | 116 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 65 insertions(+), 51 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..2e153c8 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,26 @@
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" keyColumn="id" keyProperty="id" 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="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 +69,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 +97,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 +122,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,60 +135,61 @@
<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
- , (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>
-
- <if test = "cancelTimeStart != null and cancelTimeStop != null">
- AND card.cancelDt BETWEEN #{cancelTimeStart} AND #{cancelTimeStop}
- </if>
- </where>
- </select>
-
- <!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栨敞閿�璁板綍-->
- <select id="getCancels" resultType="com.dy.pipIrrGlobal.pojoSe.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
+ FROM se_cancel can
+ 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},'%')
</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 card.cancelDt BETWEEN #{cancelTimeStart} AND #{cancelTimeStop}
+ AND can.operateDt BETWEEN #{cancelTimeStart} AND #{cancelTimeStop}
</if>
</where>
+ </select>
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ <!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栨敞閿�璁板綍-->
+ <select id="getCancels" resultType="com.dy.pipIrrGlobal.voSe.VoCancel">
+ SELECT
+ (@i:=@i+1) AS id,
+ cli.`name` AS clientName,
+ cli.clientNum,
+ card.cardNum,
+ 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 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},'%')
+ </if>
+
+ <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
+ <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