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/YwUnitMapper.xml | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
index 159fc09..b88a779 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
@@ -35,24 +35,38 @@
<select id="workList" resultType="integer">
SELECT
- count(DISTINCT wo.id)
+ count(DISTINCT wo.id)
FROM
- t_work_order wo
- INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
- INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
- INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
- INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
- <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
- collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach>
- </if>
+ t_work_order wo
+ INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
+ INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
+ INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
+ INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
WHERE
- wo.unit_id = #{query.unitId} AND wo.deleted = 0
- <if test="query.status != null and query.status != ''">
- AND wo.status = #{query.status}
- </if>
- <if test="query.keyword != null and query.keyword != ''">
- AND (tm.name like concat('%', #{query.keyword}, '%') or tm.serial_number like concat('%', #{query.keyword}, '%'))
- </if>
+ wo.unit_id = #{query.unitId} AND wo.deleted = 0
+ <if test="query.status != null and query.status != ''">
+ AND wo.status = #{query.status}
+ </if>
+ <if test="query.isNotDistribute != null and query.isNotDistribute">
+ AND wo.status != 'WAIT_DISTRIBUTE'
+ </if>
+ <if test="query.keyword != null and query.keyword != ''">
+ AND (tm.name like concat('%', #{query.keyword}, '%') or tm.serial_number like concat('%', #{query.keyword},
+ '%'))
+ </if>
+ <if test="query.start != null and query.end != null">
+ AND wo.create_time BETWEEN #{query.start} AND #{query.end}
+ </if>
+ <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">
+ AND (EXISTS (
+ SELECT 1
+ FROM t_work_order_error_type twoet
+ WHERE twoet.work_order_no = wo.work_order_no
+ AND twoet.error_name in
+ <foreach collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}
+ </foreach>
+ ))
+ </if>
</select>
<insert id="insertYwUnit" parameterType="YwUnit" useGeneratedKeys="true" keyProperty="id">
--
Gitblit v1.8.0