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/YwPointMapper.xml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index bb27935..e4e9379 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -51,10 +51,6 @@
<result column="column_value" property="columnValue"/>
</resultMap>
- <select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
-
- </select>
-
<select id="page" resultMap="pageMap">
SELECT
typ.id,
@@ -83,6 +79,9 @@
typ.examine_status = 1
<if test="query.pointName != null and query.pointName != ''">
AND typ.point_name like concat('%', #{query.pointName}, '%')
+ </if>
+ <if test="query.unitId != null">
+ AND typ.unit_id = #{query.unitId}
</if>
</where>
</select>
@@ -230,6 +229,7 @@
yu.unit_name,
yp.start_time,
yp.end_time,
+ d.area,
CASE WHEN yp.province_tag = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagString,
CASE WHEN yp.important_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantTagString,
CASE WHEN yp.important_command_image_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantCommandImageTagString,
@@ -238,6 +238,7 @@
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
LEFT JOIN t_yw_unit yu ON yu.id = yp.unit_id
+ LEFT JOIN sys_dept d ON yp.dept_id = d.dept_id
<where>
yp.examine_status = 1
<if test="query.pointName != null and query.pointName != ''">
@@ -360,5 +361,17 @@
serial_number, province_tag, important_tag, important_command_image_tag, dept_tag
</select>
-
+ <select id="selectToCount" resultType="com.ycl.platform.domain.vo.YwPointVO">
+ select p.* from t_yw_point p
+ left join t_monitor m on p.serial_number = m.serial_number
+ <where>
+ p.examine_status = 1 and m.camera_fun_type like concat('%',#{examineCategory},'%')
+ <if test="examineTag == 0">
+ and p.province_tag = 1
+ </if>
+ <if test="examineTag == 2">
+ and p.dept_tag = 1
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.8.0