From 3dc714284a95fe9677a964ec039b2b547547e30d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 05 十一月 2024 11:20:37 +0800
Subject: [PATCH] 工单异步获取图片、工单导出时间参数bug
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 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..37499af 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,
@@ -230,6 +226,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 +235,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 +358,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