From dcf2c39ca10e6b7e91a7970cd784a5bf07a55207 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期二, 18 二月 2025 16:41:52 +0800
Subject: [PATCH] merge
---
exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml b/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml
index 1f0eecd..4b45803 100644
--- a/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml
@@ -1,10 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.exam.pay.mapper.CoalPayStudentMapper">
<sql id="selectCoalPayStudentVo">
- select id, coal_pay_id, name, id_card, phone, sex, pay_code, pay_status,pay_type,order_id,order_no,file_data,gov_pay_status, update_by, update_time, create_by, create_time, del_flag from coal_pay_student
+ select id,
+ coal_pay_id,
+ name,
+ id_card,
+ phone,
+ sex,
+ pay_code,
+ pay_status,
+ pay_type,
+ order_id,
+ file_data,
+ gov_pay_status,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ del_flag,
+ order_no,
+ pay_time
+ from coal_pay_student
</sql>
<insert id="insertCoalPayStudent">
insert into coal_pay_student
@@ -19,7 +38,7 @@
<if test="payStatus != null">pay_status,</if>
<if test="payType != null">pay_type,</if>
<if test="orderId!=null">order_id,</if>
- <if test="orderNo!=null">order_no,</if>
+ <if test="orderNo != null and orderNo != '' ">order_no,</if>
<if test="fileData!=null">file_data,</if>
<if test="govPayStatus!=null">gov_pay_status,</if>
<if test="createBy != null">create_by,</if>
@@ -39,7 +58,7 @@
<if test="payStatus != null">#{payStatus},</if>
<if test="payType != null">#{payType},</if>
<if test="orderId!=null">#{orderId},</if>
- <if test="orderNo!=null">#{orderNo},</if>
+ <if test="orderNo != null and orderNo != '' ">#{orderNo},</if>
<if test="fileData!=null">#{fileData},</if>
<if test="govPayStatus!=null">#{govPayStatus},</if>
<if test="createBy != null">#{createBy},</if>
@@ -66,9 +85,9 @@
<if test="sex != null">sex = #{sex},</if>
<if test="payType != null">pay_type = #{payType},</if>
<if test="payCode != null">pay_code = #{payCode},</if>
+ <if test="payTime != null">pay_time = #{payTime},</if>
<if test="payStatus != null">pay_status = #{payStatus},</if>
<if test="orderId!=null">order_id=#{orderId},</if>
- <if test="orderNo!=null">order_no=#{orderNo},</if>
<if test="fileData!=null">file_data=#{fileData},</if>
<if test="govPayStatus!=null">gov_pay_status=#{govPayStatus},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@@ -86,15 +105,16 @@
</update>
<update id="updateByCoalPayIdAndStatus">
update coal_pay_student
- set order_id = #{orderId},order_no=#{orderNo},
- gov_pay_status = #{govPayStatus},pay_code = #{payCode}
- where coal_pay_id = #{coalPayId} and pay_status = 0 and pay_type = 2
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="payType != null">pay_type = #{payType},</if>
+ </trim>
+ where coal_pay_id = #{coalPayId} and pay_status = 0
</update>
<select id="selectByCoalPayId" resultType="com.gkhy.exam.pay.entity.CoalPayStudent">
<include refid="selectCoalPayStudentVo"></include>
- where coal_pay_id = #{coalPayId}
- and del_flag =0
+ where coal_pay_id = #{coalPayId}
+ and del_flag =0
</select>
<select id="selectByCoalPayIdAndPayStatus" resultType="com.gkhy.exam.pay.entity.CoalPayStudent">
@@ -103,9 +123,9 @@
<if test="status == 0">
and pay_type = 2
</if>
- and coal_pay_id = #{id}
- and pay_status = #{status}
- and del_flag =0
+ and coal_pay_id = #{id}
+ and pay_status = #{status}
+ and del_flag =0
</where>
</select>
--
Gitblit v1.9.2