From 0b357d525c83203162eb053aed9c87604156f94a Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 10:58:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_dept'
---
src/main/resources/mapper/ExamTemplatesMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/ExamTemplatesMapper.xml b/src/main/resources/mapper/ExamTemplatesMapper.xml
index 97384b9..cfb27e4 100644
--- a/src/main/resources/mapper/ExamTemplatesMapper.xml
+++ b/src/main/resources/mapper/ExamTemplatesMapper.xml
@@ -16,12 +16,12 @@
<sql id="Base_Column_List">
id
- , name, paper_type, suggest_time, title_name, ctime, status, menu_ids,start_time,end_time
+ , name, paper_type, suggest_time, title_name, ctime, status, menu_ids,start_time,end_time, dept_id
</sql>
<insert id="add" parameterType="com.mindskip.xzs.domain.ExamTemplates" useGeneratedKeys="true" keyProperty="id">
- insert into t_exam_templates (name, paper_type, dept_id, suggest_time, title_name, ctime, status, menu_ids,start_time,end_time)
- values (#{name}, #{paperType}, #{deptId}, #{suggestTime}, #{titleName}, #{ctime}, #{status}, #{menuIds},#{startTime},#{endTime})
+ insert into t_exam_templates (name, paper_type, dept_id, suggest_time, title_name, ctime, status, menu_ids,start_time,end_time,create_user)
+ values (#{name}, #{paperType}, #{deptId}, #{suggestTime}, #{titleName}, #{ctime}, #{status}, #{menuIds},#{startTime},#{endTime}, #{createUser})
</insert>
<select id="getTime" resultMap="BaseResultMap">
@@ -35,7 +35,7 @@
<select id="gets" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.domain.vo.ExamTemplatesVO">
select
DISTINCT e.id
- , e.name, e.paper_type, e.suggest_time, e.title_name, e.ctime, e.status, e.menu_ids,e.start_time,e.end_time
+ , e.name, e.paper_type, e.suggest_time, e.title_name, e.ctime, e.status, e.menu_ids,e.start_time,e.end_time,e.ctime
from t_exam_templates e
inner join t_exam_templates_user u on e.id = u.templates_id
<where>
@@ -57,7 +57,7 @@
<select id="getByadmins" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.domain.vo.ExamTemplatesVO">
select
DISTINCT e.id
- , e.name, e.paper_type, e.suggest_time, e.title_name, e.ctime, e.status, e.menu_ids,e.start_time,e.end_time
+ , e.name, e.paper_type, e.suggest_time, e.title_name, e.ctime, e.status, e.menu_ids,e.start_time,e.end_time, e.create_user
from t_exam_templates e
left join t_exam_templates_user u on e.id = u.templates_id
<where>
--
Gitblit v1.8.0