From 430477c7e0777531f22fc18dc8906ea75cdc21d9 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 03 十二月 2025 16:53:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml b/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml
index 2f13d41..a9dada5 100644
--- a/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml
@@ -19,18 +19,19 @@
sc.`name` as company_name,
q.`year`,
q.type,
- q.depart_name,
+ q.depart_id,
+ sd.dept_name as depart_name,
qd.`quality_id`,
qd.`number`,
qd.`serial`,
qd.`fiction_id`,
- qd.`fiction_name`,
+ su1.`name` as fiction_name,
qd.`fiction_time`,
qd.`check_id`,
- qd.`check_name`,
+ su2.`name` as check_name,
qd.`check_time`,
qd.`ratify_id`,
- qd.`ratify_name`,
+ su3.`name` as ratify_name,
qd.`ratify_time`,
qd.`del_flag`,
qd.`create_by`,
@@ -38,8 +39,12 @@
qd.`update_by`,
qd.`update_time`
FROM quality_decompose qd
- LEFT JOIN quality q on qd.quality_id = q.id
- left join sys_company sc on q.company_id = sc.id
+ LEFT JOIN quality q on qd.quality_id = q.id
+ left join sys_company sc on q.company_id = sc.id
+ left join sys_dept sd on q.depart_id = sd.dept_id
+ left join sys_user su1 on qd.fiction_id = su1.id
+ left join sys_user su2 on qd.check_id = su2.id
+ left join sys_user su3 on qd.ratify_id = su3.id
WHERE qd.del_flag = 1
<if test="companyId !=null and companyId!=''">
and q.company_id =#{companyId}
--
Gitblit v1.9.2