From d7471cff04678b91271bdc566bcbddf2f4ab04b7 Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期五, 04 七月 2025 15:17:08 +0800 Subject: [PATCH] 修改 --- multi-system/src/main/resources/mapper/system/QualityMapper.xml | 10 ++++++---- multi-system/src/main/resources/mapper/system/CatalogueMapper.xml | 11 ++++++++++- multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml | 3 ++- multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml | 7 ++++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml b/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml index 5855d20..159678b 100644 --- a/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml +++ b/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml @@ -98,7 +98,16 @@ <if test="type!=null"> and type = #{type} </if> - ORDER BY create_time ASC + ORDER BY + CAST(SUBSTRING_INDEX(number, '.', 1) AS UNSIGNED) ASC, + CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(number, '.', 2), '.', -1) AS UNSIGNED) ASC, -- 第二级 + CAST( + CASE + WHEN LENGTH(number) - LENGTH(REPLACE(number, '.', '')) >= 2 + THEN SUBSTRING_INDEX(number, '.', -1) + ELSE '0' + END AS UNSIGNED + ) ASC </select> <select id="selectCatalogueDataList" resultType="com.gkhy.exam.system.domain.vo.CatalogueDataVo"> SELECT diff --git a/multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml b/multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml index 6a7946c..a43a488 100644 --- a/multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml +++ b/multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml @@ -9,7 +9,7 @@ sc.`name` as company_name, q.year, q.type, - q.depart_name, + sd.dept_name as depart_name, qa.`quality_id`, qa.`serial`, qa.`frequency`, @@ -28,6 +28,7 @@ quality_accomplish qa LEFT JOIN quality q ON qa.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 WHERE qa.del_flag = 1 <if test="companyId!=null and companyId!=''"> diff --git a/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml b/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml index 2f13d41..056151e 100644 --- a/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml +++ b/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml @@ -19,7 +19,7 @@ sc.`name` as company_name, q.`year`, q.type, - q.depart_name, + sd.dept_name as depart_name, qd.`quality_id`, qd.`number`, qd.`serial`, @@ -38,8 +38,9 @@ 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 WHERE qd.del_flag = 1 <if test="companyId !=null and companyId!=''"> and q.company_id =#{companyId} diff --git a/multi-system/src/main/resources/mapper/system/QualityMapper.xml b/multi-system/src/main/resources/mapper/system/QualityMapper.xml index cb0db08..a473e16 100644 --- a/multi-system/src/main/resources/mapper/system/QualityMapper.xml +++ b/multi-system/src/main/resources/mapper/system/QualityMapper.xml @@ -96,7 +96,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`, @@ -108,7 +108,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 <if test="companyId!=null and companyId!=''"> @@ -132,7 +133,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 +145,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