From f0ec80a9eb4d12aca25f311fecf8f6e5edf8c577 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 06 十一月 2024 16:47:00 +0800
Subject: [PATCH] 工单加搜索table、一些搜索bug
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
index 7573a34..810fadd 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.WorkOrderWhiteMapper">
-
+
<resultMap type="WorkOrderWhite" id="WorkOrderWhiteResult">
<result property="id" column="id" />
<result property="serialNumber" column="serial_number" />
@@ -25,11 +25,12 @@
where serial_number = #{serialNumber}
</update>
- <select id="page" parameterType="Long" resultMap="WorkOrderWhiteResult">
+ <select id="page" parameterType="com.ycl.platform.domain.query.WorkOrderWhiteQuery" resultMap="WorkOrderWhiteResult">
<include refid="selectWorkOrderWhiteVo"/>
<where>
- <if test="query.serialNumber != null and query.serialNumber != ''"> and serial_number = #{query.serialNumber}</if>
- <if test="query.pointName != null and query.pointName != ''"> and point_name like concat('%', #{query.pointName}, '%')</if>
+ <if test="query.keyword != null and query.keyword != ''">
+ and (serial_number like concat('%',#{query.keyword},'%') or point_name like concat('%', #{query.keyword}, '%'))
+ </if>
</where>
</select>
<select id="selectBySerialNumber" resultType="com.ycl.platform.domain.entity.WorkOrderWhite">
@@ -57,7 +58,7 @@
</insert>
<delete id="deleteWorkOrderWhiteByIds" parameterType="String">
- delete from t_work_order_white where id in
+ delete from t_work_order_white where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
@@ -68,4 +69,4 @@
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.8.0