From 75960d6e223f8cab9ceb489f6b89f5f08c6db62a Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 01 八月 2025 17:24:32 +0800
Subject: [PATCH] 部分新功能

---
 multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml b/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml
index 6b12112..a9dada5 100644
--- a/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.gkhy.exam.system.mapper.QualityDecomposeMapper">
     <insert id="insertDecompose" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO
-            `train_exam`.`quality_decompose`
+           `quality_decompose`
             ( `company_id`, `quality_id`, `number`, `serial`, `fiction_id`, `fiction_name`, `fiction_time`, `check_id`,`check_name`,
              `check_time`, `ratify_id`, `ratify_name`, `ratify_time`, `create_by`, `create_time`)
         VALUES
@@ -16,21 +16,22 @@
         SELECT
             qd.`id`,
             qd.`company_id`,
-            q.company_name,
+            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,7 +39,12 @@
             qd.`update_by`,
             qd.`update_time`
         FROM quality_decompose qd
-                 LEFT JOIN quality q on qd.quality_id = q.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}
@@ -75,5 +81,8 @@
         where del_flag = 1
         and quality_id=#{qualityId}
     </select>
+    <select id="selectByDelFlag" resultType="java.lang.Integer">
+        select quality_id from  quality_decompose where del_flag = 1
+    </select>
 
 </mapper>

--
Gitblit v1.9.2