From cf3eb8aade51e277d6d732e28e89f64ac3adca6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 八月 2023 16:19:51 +0800
Subject: [PATCH] 大屏
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index e24c1d8..c90d22e 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -533,13 +533,14 @@
<select id="getRecordLog" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO"
resultType="doumeemes.dao.business.dto.statistics.RecordLogModel">
select a.CREATE_TIME as createTime,a.UNQUALIFIED_NUM as unqualifiedNum,a.QUALIFIED_NUM as qualifiedNum,
- d.name as userName,c.name as materialName,c.code as materialCode
+ d.name as userName,c.name as materialName,c.code as materialCode,p.name as procedureName
from workorder_record a
left join material_distribute b on a.MATERIAL_ID=b.ID
left join material c on b.MATERIAL_ID=c.ID
left join company_user d on d.DELETED=0 and d.user_id=a.CREATE_USER and d.root_depart_id=a.root_depart_id
+ left join procedures p on a.PROCEDURE_ID=p.ID
left JOIN workorder e on e.id=a.WORKORDER_ID
- where a.DELETED = 0 AND a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId} AND e.`STATUS` = 4
+ where a.DELETED = 0 AND a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId} AND e.`STATUS` = 4 and a.type=1
<if test="procedureId != null">
AND a.`PROCEDURE_ID` = #{procedureId}
</if>
--
Gitblit v1.9.3