From 8c91afa9c1bbe5fae9d88cfd1e7243c376af69fe Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 21 七月 2025 09:19:29 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/resources/mapper/system/QualityMapper.xml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/multi-system/src/main/resources/mapper/system/QualityMapper.xml b/multi-system/src/main/resources/mapper/system/QualityMapper.xml
index b4e7ff7..49ad8c5 100644
--- a/multi-system/src/main/resources/mapper/system/QualityMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/QualityMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.gkhy.exam.system.mapper.QualityMapper">
<insert id="insertQuality" useGeneratedKeys="true" keyProperty="id">
- INSERT INTO `train_exam`.`quality` (
+ INSERT INTO `quality` (
`company_id`,`company_name`,`year`,`num`,`type`, `depart_id`,`depart_name`,`method`,`compilation_id`, `compilation_name`,`compilation_time`,`quality_id`,`quality_name`,
`quality_time`,`lead_id`,`lead_name`,`lead_time`,`create_by`,`create_time`
)
@@ -96,19 +96,23 @@
q.`num`,
q.`type`,
q.`depart_id`,
- q.`depart_name`,
+ sd.`dept_name` as depart_name,
q.`method`,
q.`compilation_id`,
- q.`compilation_name`,
+ su1.`name` as compilation_name,
q.`compilation_time`,
q.`quality_id`,
- q.`quality_name`,
+ su2.`name` as quality_name,
q.`quality_time`,
q.`lead_id`,
- q.`lead_name`,
+ su3.`name` as lead_name,
q.`lead_time`
FROM quality q
- left join sys_company sc on q.company_id = sc.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 q.compilation_id = su1.id
+ left join sys_user su2 on q.quality_id = su2.id
+ left join sys_user su3 on q.lead_id = su3.id
WHERE
q.del_flag=1
<if test="companyId!=null and companyId!=''">
@@ -119,6 +123,9 @@
</if>
<if test="type!=null and type!=''">
and q.`type` = #{type}
+ </if>
+ <if test="departId!=null">
+ and q.depart_id = #{departId}
</if>
ORDER BY
q.create_time DESC
@@ -132,7 +139,7 @@
q.`num`,
q.`type`,
q.`depart_id`,
- q.`depart_name`,
+ sd.`dept_name` as depart_name,
q.`method`,
q.`compilation_id`,
q.`compilation_name`,
@@ -144,7 +151,8 @@
q.`lead_name`,
q.`lead_time`
FROM quality q
- left join sys_company sc on q.company_id = sc.id
+ left join sys_company sc on q.company_id = sc.id
+ left join sys_dept sd on q.depart_id = sd.dept_id
WHERE
q.del_flag=1 and q.`type` = #{type} and q.`year` = #{year}
<if test="type == 1">
--
Gitblit v1.9.2