From a562df3729551d8deebf87e96b0a5e8f6a6c30d1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 四月 2024 17:01:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 62 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 2c73866..364b380 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -4,15 +4,59 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.WorkOrderVO">
- <result column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="work_order_no" property="workOrderNo" />
- <result column="unit_id" property="unitId" />
- <result column="yw_people_id" property="ywPeopleId" />
- <result column="yw_handle_time" property="ywHandleTime" />
- <result column="yw_result" property="ywResult" />
- <result column="yw_condition" property="ywCondition" />
- <result column="yw_check_result" property="ywCheckResult" />
+ <result column="id" property="id"/>
+ <result column="create_time" property="createTime"/>
+ <result column="work_order_no" property="workOrderNo"/>
+ <result column="unit_id" property="unitId"/>
+ <result column="yw_people_id" property="ywPeopleId"/>
+ <result column="yw_handle_time" property="ywHandleTime"/>
+ <result column="yw_result" property="ywResult"/>
+ <result column="yw_condition" property="ywCondition"/>
+ <result column="yw_check_result" property="ywCheckResult"/>
</resultMap>
+ <select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ SELECT
+ wo.*,
+ u.unit_name,
+ p.yw_person_name
+ FROM
+ t_work_order wo
+ LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = '0'
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
+ where
+ wo.deleted = '0'
+ <if test="query.workOrderNo != null and query.workOrderNo != ''">
+ AND wo.work_order_no = #{query.workOrderNo}
+ </if>
+ <if test="query.status != null">
+ AND wo.status = #{query.status}
+ </if>
+ <if test="query.errorType != null and query.errType != ''">
+ AND wo.error_type = #{query.errorType}
+ </if>
+ <if test="query.start != null">
+ AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
+ </if>
+ ORDER BY wo.create_time DESC
+ </select>
+
+ <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ SELECT
+ wo.*,
+ u.unit_name,
+ p.yw_person_name
+ FROM
+ t_work_order wo
+ LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = '0'
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
+ where
+ wo.deleted = '0'
+ and wo.status = 'WAIT_DISTRIBUTE'
+ <if test="query.unitId != null">
+ AND wo.unit_id = #{query.unitId}
+ </if>
+ ORDER BY wo.create_time DESC
+ </select>
+
</mapper>
--
Gitblit v1.8.0