From d6372da6f37778e90a4bae02865e8ec77e980b6e Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 17 七月 2025 17:14:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
index f67c832..17d2d32 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
@@ -17,7 +17,8 @@
t2.equipment_model equipmentModel,
t2.factory_org_code factoryName,
DATEPART( YEAR, t1.inspection_date ) AS inspectionYear,
- DATEPART( MONTH, t1.inspection_date ) AS inspectionMonth
+ DATEPART( MONTH, t1.inspection_date ) AS inspectionMonth,
+ t1.hf_code hfCode
FROM
eam_inspection_order t1
LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
@@ -111,6 +112,7 @@
LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
LEFT JOIN eam_inspection_order t3 ON t3.inspection_date = t1.plan_inspection_date
AND t3.equipment_id = t1.equipment_id
+ AND t1.inspector IS NOT NULL
WHERE
t2.equipment_code = #{equipmentCode}
AND t3.inspection_date LIKE CONCAT(#{inspectionDate},'%')
--
Gitblit v1.9.3