From bd5d1dae54ea1e42e9e9f0d00f671d95914b105f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 16:54:56 +0800
Subject: [PATCH] Merge branch 'dev_新疆马铃薯pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_新疆马铃薯pro
---
src/main/resources/mapper/approve/ApprovalInstanceMapper.xml | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
index 6b47daa..9e487dd 100644
--- a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
+++ b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
@@ -39,16 +39,27 @@
and ai. template_id = #{ew.templateId}
</if>
<if test="ew.businessType != null ">
- and ai. business_type = #{ew.businessType}
+ and ai.business_type = #{ew.businessType}
</if>
- <if test="ew.createTime != null">
- and ai.create_time between to_date(#{ew.createTimeStart}) and to_date(#{ew.createTimeEnd})
+ <if test="ew.createTimeStart != null and ew.createTimeEnd != null">
+ and ai.apply_time >= #{ew.createTimeStart}
+ and ai.apply_time <= #{ew.createTimeEnd}
</if>
<if test="ew.status != null">
and ai.status = #{ew.status}
</if>
+ <if test="ew.applicantName != null and ew.applicantName !=''">
+ and ai.applicant_name = #{ew.applicantName}
+ </if>
+ <if test="ew.currentUserId != null">
+ and (ai.applicant_id = #{ew.currentUserId}
+ or exists (select 1 from approval_task at2
+ where at2.instance_id = ai.id
+ and at2.approver_id = #{ew.currentUserId}
+ and at2.deleted = 0))
+ </if>
</where>
- order by ai.id desc
+ order by ai.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3