From 6b1077a1cb9f1fe09a8e1e92db23ffa840ddc478 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 三月 2024 15:33:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml
index 58df6ae..c068482 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml
@@ -8,18 +8,20 @@
<result property="id" column="id" />
<result property="examineName" column="examine_name" />
<result property="templateId" column="template_id" />
- <result property="timeRange" column="time_range" />
+ <result property="examineRange" column="examine_range" />
<result property="frequency" column="frequency" />
<result property="state" column="state" />
<result property="createTime" column="create_time" />
<result property="createUser" column="create_user" />
+ <result property="createUserName" column="create_user_name" />
<result property="updateTime" column="update_time" />
<result property="updateUser" column="update_user" />
+ <result property="updateUserName" column="update_user_name" />
<result property="description" column="description" />
</resultMap>
<sql id="selectTCheckPublishVo">
- select id , examine_name, template_id , time_range , frequency , state , create_time , create_user , update_time , update_user , description from t_check_publish
+ select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time , update_user , description,create_user_name,update_user_name from t_check_publish
</sql>
<select id="selectTCheckPublishList" parameterType="com.ycl.platform.domain.entity.TCheckPublish" resultMap="TCheckPublishResult">
@@ -27,7 +29,7 @@
<where>
<if test="templateId != null "> and template_id = #{templateId}</if>
<if test="examineName != null and examineName != '' "> and examine_name = #{examineName}</if>
- <if test="timeRange != null "> and time_range = #{timeRange}</if>
+ <if test="examineRange != null "> and examine_range = #{examineRange}</if>
<if test="frequency != null "> and frequency = #{frequency}</if>
<if test="state != null "> and state = #{state}</if>
<if test="createUser != null "> and create_user = #{createUser}</if>
@@ -47,26 +49,30 @@
<if test="id != null">id,</if>
<if test="examineName != null and examineName != ''">examine_name,</if>
<if test="templateId != null">template_id,</if>
- <if test="timeRange != null">time_range,</if>
+ <if test="examineRange != null">examine_range,</if>
<if test="frequency != null">frequency,</if>
<if test="state != null">state,</if>
<if test="createTime != null">create_time,</if>
<if test="createUser != null">create_user,</if>
+ <if test="createUserName != null and createUserName!= ''">create_user_name,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateUser != null">update_user,</if>
+ <if test="updateUserName != null and updateUserName!= ''">update_user_name,</if>
<if test="description != null">description,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="examineName != null and examineName != ''">#{examineName},</if>
<if test="templateId != null">#{templateId},</if>
- <if test="timeRange != null">#{timeRange},</if>
+ <if test="examineRange != null">#{examineRange},</if>
<if test="frequency != null">#{frequency},</if>
<if test="state != null">#{state},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createUser != null">#{createUser},</if>
+ <if test="createUserName != null and createUserName!= ''">#{createUserName},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateUser != null">#{updateUser},</if>
+ <if test="updateUserName != null and updateUserName!= ''">#{updateUserName},</if>
<if test="description != null">#{description},</if>
</trim>
</insert>
@@ -76,13 +82,15 @@
<trim prefix="SET" suffixOverrides=",">
<if test="examineName != null and examineName != ''">examine_name = #{examineName},</if>
<if test="templateId != null">template_id = #{templateId},</if>
- <if test="timeRange != null">time_range = #{timeRange},</if>
+ <if test="examineRange != null">examine_range = #{examineRange},</if>
<if test="frequency != null">frequency = #{frequency},</if>
<if test="state != null">state = #{state},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createUser != null">create_user = #{createUser},</if>
+ <if test="createUserName != null and createUserName!= ''">create_user_name = #{createUserName},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateUser != null">update_user = #{updateUser},</if>
+ <if test="updateUserName != null and updateUserName!= ''">update_user_name = #{updateUserName},</if>
<if test="description != null">description = #{description},</if>
</trim>
where id = #{id}
--
Gitblit v1.8.0