From 6d5fc7859473d30a2e4c1f20f748abae652342b8 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 28 十一月 2025 13:11:26 +0800
Subject: [PATCH] 功能修改
---
multi-system/src/main/resources/mapper/system/QualityMapper.xml | 104 ++++++++++++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 47 deletions(-)
diff --git a/multi-system/src/main/resources/mapper/system/QualityMapper.xml b/multi-system/src/main/resources/mapper/system/QualityMapper.xml
index 29c3562..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`
)
@@ -89,67 +89,77 @@
<select id="selectQualityTarget" resultType="com.gkhy.exam.system.domain.vo.QualityTargetVo">
SELECT
- `id`,
- `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`
- FROM quality
+ q.`id`,
+ q.`company_id`,
+ sc.`name` as `company_name`,
+ q.`year`,
+ q.`num`,
+ q.`type`,
+ q.`depart_id`,
+ sd.`dept_name` as depart_name,
+ q.`method`,
+ q.`compilation_id`,
+ su1.`name` as compilation_name,
+ q.`compilation_time`,
+ q.`quality_id`,
+ su2.`name` as quality_name,
+ q.`quality_time`,
+ q.`lead_id`,
+ 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_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
- del_flag=1
+ q.del_flag=1
<if test="companyId!=null and companyId!=''">
- and company_id = #{companyId}
+ and q.company_id = #{companyId}
</if>
<if test="year!=null and year!=''">
- and `year` = #{year}
+ and q.`year` = #{year}
</if>
<if test="type!=null and type!=''">
- and `type` = #{type}
+ and q.`type` = #{type}
+ </if>
+ <if test="departId!=null">
+ and q.depart_id = #{departId}
</if>
ORDER BY
- create_time DESC
+ q.create_time DESC
</select>
<select id="selectQualityByType" resultType="com.gkhy.exam.system.domain.Quality">
SELECT
- `id`,
- `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`
- FROM quality
+ q.`id`,
+ q.`company_id`,
+ sc.`name` as company_name,
+ q.`year`,
+ q.`num`,
+ q.`type`,
+ q.`depart_id`,
+ sd.`dept_name` as depart_name,
+ q.`method`,
+ q.`compilation_id`,
+ q.`compilation_name`,
+ q.`compilation_time`,
+ q.`quality_id`,
+ q.`quality_name`,
+ q.`quality_time`,
+ q.`lead_id`,
+ q.`lead_name`,
+ q.`lead_time`
+ FROM quality q
+ left join sys_company sc on q.company_id = sc.id
+ left join sys_dept sd on q.depart_id = sd.dept_id
WHERE
- del_flag=1 and `type` = #{type} and `year` = #{year}
+ q.del_flag=1 and q.`type` = #{type} and q.`year` = #{year}
<if test="type == 1">
- and company_id = #{companyId}
+ and q.company_id = #{companyId}
</if>
<if test="type == 2">
- and depart_id = #{departId}
+ and q.depart_id = #{departId}
</if>
</select>
--
Gitblit v1.9.2