From 66e9e037d7c3b97880a57693b8d3fabf3f0a8dcb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 00:52:54 +0800
Subject: [PATCH] 合同考核点位在线率调整
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
index 43dce5d..09d7a95 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
@@ -7,16 +7,19 @@
<result column="id" property="id"/>
<result column="create_time" property="createTime"/>
<result column="yw_condition" property="ywCondition"/>
- <result column="commit_user" property="commitUser"/>
- <result column="nick_name" property="commitUserName"/>
+ <result column="unitId" property="unitId"/>
+ <result column="unit_name" property="unitName"/>
<result column="sys_msg" property="sysMsg"/>
<result column="yw_proofMaterials" property="ywProofMaterials"/>
</resultMap>
<select id="selectYwConditionByYwId" resultMap="BaseResultMap">
- SELECT yw.id, yw.commit_user, yw.yw_condition, 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_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name
FROM t_work_order_yw_condition_record yw
- INNER 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