From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml |   78 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml
index 3d472bb..bc6c813 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml
@@ -36,6 +36,77 @@
             <if test="p.payTime != null and p.payTime !=''">
                 and pay_time = #{p.payTime}
             </if>
+            <if test="p.payStatus != null and p.payStatus !=''">
+                and pay_status = #{p.payStatus}
+            </if>
+            <if test="p.payMethod != null and p.payMethod !=''">
+                and pay_method = #{p.payMethod}
+            </if>
+            <if test="p.diaId != null and p.diaId !=''">
+                and dia_id = #{p.diaId}
+            </if>
+            <if test="p.tradeNo != null and p.tradeNo !=''">
+                and trade_no = #{p.tradeNo}
+            </if>
+            <if test="p.prepayId != null and p.prepayId !=''">
+                and prepay_id = #{p.prepayId}
+            </if>
+            <if test="p.type != null and p.type !=''">
+                and type = #{p.type}
+            </if>
+            <if test="p.createUserId != null and p.createUserId !=''">
+                and create_user_id = #{p.createUserId}
+            </if>
+            <if test="p.createUserName != null and p.createUserName !=''">
+                and create_user_name = #{p.createUserName}
+            </if>
+            <if test="p.updateUserId != null and p.updateUserId !=''">
+                and update_user_id = #{p.updateUserId}
+            </if>
+            <if test="p.updateUserName != null and p.updateUserName !=''">
+                and update_user_name = #{p.updateUserName}
+            </if>
+            <if test="p.updateTime != null and p.updateTime !=''">
+                and update_time = #{p.updateTime}
+            </if>
+        </where>
+    </sql>
+
+    <!--sql查询片段-->
+    <sql id="where_map">
+        <where>
+            <!--查询条件自行添加-->
+            is_del=0
+            <if test="p.id != null and p.id !=''">
+                and id = #{p.id}
+            </if>
+            <if test="p.createHospitalDepartment != null and p.createHospitalDepartment !=''">
+                and create_hospital_department = #{p.createHospitalDepartment}
+            </if>
+            <if test="p.createHospitalDepartid != null and p.createHospitalDepartid !=''">
+                and create_hospital_departid = #{p.createHospitalDepartid}
+            </if>
+            <if test="p.createHospitalId != null and p.createHospitalId !=''">
+                and create_hospital_id = #{p.createHospitalId}
+            </if>
+            <if test="p.createHospitalName != null and p.createHospitalName !=''">
+                and create_hospital_name = #{p.createHospitalName}
+            </if>
+            <if test="p.createDoctorId != null and p.createDoctorId !=''">
+                and create_doctor_id = #{p.createDoctorId}
+            </if>
+            <if test="p.createDoctorIdName != null and p.createDoctorIdName !=''">
+                and create_doctor_name like '%${p.createDoctorIdName}%'
+            </if>
+            <if test="p.payPrice != null and p.payPrice !=''">
+                and pay_price = #{p.payPrice}
+            </if>
+            <if test="p.outTradeNo != null and p.outTradeNo !=''">
+                and out_trade_no = #{p.outTradeNo}
+            </if>
+            <if test="p.payTime != null and p.payTime !=''">
+                and pay_time = #{p.payTime}
+            </if>
             <if test="p.endTime != null and p.endTime !=''">
                 and DATE_FORMAT( pay_time, '%Y-%m-%d') &lt;= #{p.endTime}
             </if>
@@ -57,8 +128,8 @@
             <if test="p.prepayId != null and p.prepayId !=''">
                 and prepay_id = #{p.prepayId}
             </if>
-            <if test="p.type != null ">
-                and  type =  #{p.type}
+            <if test="p.type != null and p.type !='' ">
+                and type = #{p.type}
             </if>
             <if test="p.createUserId != null and p.createUserId !=''">
                 and create_user_id = #{p.createUserId}
@@ -77,7 +148,6 @@
             </if>
         </where>
     </sql>
-
     <!--定义根据-SaasClientPay当作查询条件返回对象-->
     <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.SaasClientPay">
         select
@@ -93,7 +163,7 @@
         select
         <include refid="Column_List"/>
         from saas_client_pay
-        <include refid="where"/>
+        <include refid="where_map"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0