From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序,还要根据工艺路线的工序的顺序进行排序,开始的排在前面
---
src/main/resources/mapper/safe/SafeAccidentMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeAccidentMapper.xml b/src/main/resources/mapper/safe/SafeAccidentMapper.xml
index 159e7cd..c7dc368 100644
--- a/src/main/resources/mapper/safe/SafeAccidentMapper.xml
+++ b/src/main/resources/mapper/safe/SafeAccidentMapper.xml
@@ -27,7 +27,7 @@
</resultMap>
<select id="pageSafeAccident" resultType="com.ruoyi.safe.pojo.SafeAccident">
select sa.*,
- su.nick_name createUserName,
+ su.nick_name createUserName
from safe_accident sa
left join sys_user su on sa.create_user = su.user_id
where 1=1
@@ -35,13 +35,13 @@
and sa.accident_code like concat('%', #{c.accidentCode}, '%')
</if>
<if test="c.accidentName != null and c.accidentName != ''">
- and sa.accident_name like concat('%', #{accidentName}, '%')
+ and sa.accident_name like concat('%', #{c.accidentName}, '%')
</if>
<if test="c.accidentType != null and c.accidentType != ''">
- and sa.accident_type like concat('%', #{accidentType}, '%')
+ and sa.accident_type like concat('%', #{c.accidentType}, '%')
</if>
<if test="c.accidentGrade != null and c.accidentGrade != ''">
- and sa.accident_grade like concat('%', #{accidentGrade}, '%')
+ and sa.accident_grade like concat('%', #{c.accidentGrade}, '%')
</if>
</select>
--
Gitblit v1.9.3