From 2f3bbf0372e5c1f8b6b1426db2c14b3595cb0968 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 30 四月 2025 17:10:52 +0800
Subject: [PATCH] 订单下发，订单下发定时任务处理
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
index b484ef5..992bf4f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
@@ -11,13 +11,16 @@
<result column="unit_name" property="unitName"/>
<result column="sys_msg" property="sysMsg"/>
<result column="yw_proofMaterials" property="ywProofMaterials"/>
+ <result column="user_id" property="userId"/>
</resultMap>
<select id="selectYwConditionByYwId" resultMap="BaseResultMap">
- SELECT yw.id, yu.id as unit_id, yu.unit_name, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name
+ SELECT DISTINCT yw.id, yu.id as unit_id, yu.unit_name,yw.yw_condition, yw.yw_proofMaterials ,yw.create_time, yw.sys_msg, su.nick_name,su.user_id
FROM t_work_order_yw_condition_record yw
- LEFT JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderNo}
+ LEFT JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0
LEFT JOIN t_yw_unit yu ON su.unit_id = yu.id
+ WHERE
+ yw.work_order_no = #{workOrderNo}
ORDER BY yw.create_time DESC
</select>
--
Gitblit v1.8.0