From 8244adbb31a684de274a7b11a2e5293eb6dea46d Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 25 九月 2024 14:24:53 +0800 Subject: [PATCH] 工单号生成修改 --- ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml index 57d8df7..10b5140 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml @@ -68,14 +68,14 @@ <if test="query.status != null and query.status != ''"> AND wo.status = #{query.status} </if> - <if test="query.start != null"> - AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end} + <if test="query.start != null and query.end != null"> + AND wo.create_time BETWEEN #{query.start} AND #{query.end} </if> GROUP BY wo.id, wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct, u.unit_name, p.yw_person_name - ORDER BY wo.create_time DESC + ORDER BY wo.work_order_no DESC </select> <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO"> -- Gitblit v1.8.0