From f8143fe8addccd8ef25613c3fbea4cd2b2ad3ab8 Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期五, 27 六月 2025 17:08:31 +0800 Subject: [PATCH] 修改 --- multi-system/src/main/resources/mapper/system/QualityMapper.xml | 94 ++++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 46 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..b4e7ff7 100644 --- a/multi-system/src/main/resources/mapper/system/QualityMapper.xml +++ b/multi-system/src/main/resources/mapper/system/QualityMapper.xml @@ -89,67 +89,69 @@ <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`, + q.`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 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> 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`, + q.`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 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