From 735d0737c850cb4385d99fb18f485a5e6c7efbb4 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 19 十一月 2025 08:41:54 +0800
Subject: [PATCH] 功能修改

---
 multi-system/src/main/resources/mapper/system/StandardizedTemplateMapper.xml |   83 +++++++++++++++++++++++++++++++++--------
 1 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/multi-system/src/main/resources/mapper/system/StandardizedTemplateMapper.xml b/multi-system/src/main/resources/mapper/system/StandardizedTemplateMapper.xml
index 9608bfd..f38ade6 100644
--- a/multi-system/src/main/resources/mapper/system/StandardizedTemplateMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/StandardizedTemplateMapper.xml
@@ -22,6 +22,15 @@
             <if test="format != null and format !=''" >
                 format = #{format},
             </if>
+            <if test="classify !=null">
+                classify = #{classify},
+            </if>
+            <if test="industryTypeId !=null">
+                industry_type_id = #{industryTypeId},
+            </if>
+            <if test="deptId !=null">
+                dept_id = #{deptId},
+            </if>
             <if test="delFlag != null and delFlag != ''" >
                 del_flag = #{delFlag},
             </if>
@@ -43,27 +52,69 @@
 
     <select id="selectStandardizedTemplateList" resultType="com.gkhy.exam.system.domain.StandardizedTemplate">
         SELECT
-            `id`,
-            `company_id`,
-            `company_name`,
-            `template_name`,
-            `template_type`,
-            `file_path`,
-            `format`,
-            `del_flag`,
-            `create_by`,
-            `create_time`,
-            `update_by`,
-            `update_time`
+            st.`id`,
+            st.`company_id`,
+            st.`company_name`,
+            st.`template_name`,
+            st. `template_type`,
+            st. `file_path`,
+            st. `format`,
+            st. `classify`,
+            st. `dept_id`,
+            sd.`dept_name`,
+            st. `del_flag`,
+            st. `create_by`,
+            st. `create_time`,
+            st. `update_by`,
+            st. `update_time`
         FROM
-        standardized_template
+        standardized_template st
+        left join  sys_dept sd on st.dept_id =sd.dept_id
         WHERE
-            del_flag = 0 and template_type = #{templateType}
+            st.del_flag = 0 and st.template_type = #{templateType}
 
         <if test="companyId!=null and companyId!=''">
-            and company_id = #{companyId}
+            and st.company_id = #{companyId}
         </if>
         ORDER BY
-            create_time DESC
+            st.create_time DESC
     </select>
+
+
+    <select id="selectStandardizedTemplateListV2" resultType="com.gkhy.exam.system.domain.StandardizedTemplate">
+        SELECT
+        st.`id`,
+        st.`company_id`,
+        st.`company_name`,
+        st.`template_name`,
+        st. `template_type`,
+        st. `file_path`,
+        st. `format`,
+        st. `classify`,
+        st. `dept_id`,
+        sd.`dept_name`,
+        st. `del_flag`,
+        st. `create_by`,
+        st. `create_time`,
+        st. `update_by`,
+        st. `update_time`,
+        st.industry_type_id,
+        cit.`name` as industryTypeName
+        FROM
+        standardized_template st
+        left join  sys_dept sd on st.dept_id =sd.dept_id
+        left join  company_industry_type cit on cit.id =st.industry_type_id
+        WHERE
+        st.del_flag = 0 and st.template_type = #{templateType}
+
+        <if test="companyId!=null and companyId!=''">
+            and st.company_id = #{companyId}
+        </if>
+        <if test="industryTypeId!=null ">
+            and st.industry_type_id = #{industryTypeId}
+        </if>
+        ORDER BY
+        st.create_time DESC
+    </select>
+
 </mapper>

--
Gitblit v1.9.2