From 8663780ea617fd30ddf74c80085d40580179a7e9 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期三, 22 一月 2025 14:26:37 +0800
Subject: [PATCH] 特种作业非煤缴费版本导入优化

---
 exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
index 1452f5f..9370704 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
@@ -117,7 +117,12 @@
         <if test="payCompanyName != null  and payCompanyName != ''">and a.pay_company_name like concat('%',
             #{payCompanyName}, '%')
         </if>
-
+        <if test="params.startTime != null and params.startTime != ''"><!-- 开始时间检索 -->
+            AND a.create_time &gt;= #{params.startTime}
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            AND a.create_time &lt;= #{params.endTime}
+        </if>
         <if test="payCompanyCard != null  and payCompanyCard != ''">and a.pay_company_card = #{payCompanyCard}</if>
         order by a.create_time desc
     </select>
@@ -179,9 +184,10 @@
                  left join sys_dept d on a.dept_id = d.dept_id
                  left join sys_district d2 on a.district_code = d2.code
         where a.del_flag = 0
-          and t.pay_status = 0
           and t.phone = #{phone}
-          and t.id_card = #{idCard} limit 1
+          and t.id_card = #{idCard}
+        order by t.pay_status asc, t.create_time desc
+
     </select>
 
 
@@ -245,10 +251,10 @@
         where id = #{id}
     </update>
 
-    <update id="deleteNonCoalPayById" parameterType="Long">
+    <update id="deleteNonCoalPayById">
         update non_coal_pay
         set del_flag  = 2,
-            update_by = #{updateBy} non_coal_pay
+            update_by = #{updateBy}
         where id = #{id}
     </update>
 

--
Gitblit v1.9.2