From 6a0e17c8005f19ea64609d38b3d016471c281d5a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 10:46:42 +0800
Subject: [PATCH] chore(technology): 更新工序管理相关日志标题为中文

---
 src/main/resources/mapper/approve/ApprovalInstanceMapper.xml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
index 8f45b99..6b47daa 100644
--- a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
+++ b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
@@ -24,16 +24,28 @@
         <result column="deleted" property="deleted" />
     </resultMap>
     <select id="listPage" resultType="com.ruoyi.approve.bean.vo.ApprovalInstanceVo">
-        select ai.*,su.nick_name as create_user_name  from
+        select ai.*,su.nick_name as create_user_name from
         approval_instance ai
         left join sys_user su on ai.create_user = su.user_id
         <where>
             deleted = 0
             <if test="ew.instanceNo != null">
-                and instance_no like concat('%',#{ew.instanceNo},'%')
+                and ai.instance_no like concat('%',#{ew.instanceNo},'%')
             </if>
             <if test="ew.templateName != null">
-                and template_name like concat('%',#{ew.templateName},'%')
+                and ai.template_name like concat('%',#{ew.templateName},'%')
+            </if>
+            <if test="ew.templateId != null ">
+                and ai. template_id = #{ew.templateId}
+            </if>
+            <if test="ew.businessType != null ">
+                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>
+            <if test="ew.status != null">
+                and ai.status = #{ew.status}
             </if>
         </where>
         order by ai.id desc

--
Gitblit v1.9.3