From 01bbc8f0563b33dd5ce6d59f76c3bae9931615dd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 05 六月 2024 17:32:07 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml |   61 ++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml
index b04633e..ce6c640 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml
@@ -24,11 +24,20 @@
         <result property="uploadTime" column="upload_time"/>
         <result property="tag" column="tag"/>
         <result property="categoryid" column="categoryid"/>
+        <result property="topicContent" column="topic_content"/>
+        <result property="suitway" column="suitway"/>
+        <result property="isavailable" column="isavailable"/>
+        <result property="language" column="language"/>
+        <result property="otherdata" column="otherdata"/>
+        <result property="valueType" column="value_type"/>
+        <result property="reply" column="reply"/>
     </resultMap>
 
     <sql id="selectSvyLibTopicVo">
         select topicid,
                oldid,
+               value_type,
+               reply,
                svyid,
                topictype,
                topiccode,
@@ -46,20 +55,32 @@
                upload_time,
                tag,
                categoryid,
-               svy_topicid as svyTopicId
+               topic_content,
+               suitway,
+               isavailable,
+               otherdata,
+            language,
+            svy_topicid as svyTopicId
         from svy_lib_topic
     </sql>
 
     <select id="selectSvyLibTopicList" parameterType="com.smartor.domain.SvyLibTopic" resultMap="SvyLibTopicResult">
         <include refid="selectSvyLibTopicVo"/>
         <where>
+            del_flag=0
+            <if test="topicid != null ">and topicid = #{topicid}</if>
             <if test="oldid != null ">and oldid = #{oldid}</if>
-            <if test="topictype != null ">and topictype = #{topictype}</if>
+            <if test="topictype != null and topictype != ''">and topictype = #{topictype}</if>
             <if test="categoryid != null ">and categoryid = #{categoryid}</if>
-            <if test="topic != null  and topic != ''">and topic = #{topic}</if>
+            <if test="topic != null  and topic != ''">and topic like concat('%', #{topic}, '%')</if>
+
             <if test="ishide != null ">and ishide = #{ishide}</if>
             <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
             <if test="svyid != null  and svyid != ''">and svyid = #{svyid}</if>
+            <if test="topicContent != null  and topicContent != ''">and topic_content = #{topicContent}</if>
+            <if test="suitway != null  and suitway != ''">and suitway = #{suitway}</if>
+            <if test="isavailable != null  and isavailable != ''">and isavailable = #{isavailable}</if>
+            <if test="language != null  and language != ''">and language = #{language}</if>
         </where>
     </select>
 
@@ -91,6 +112,13 @@
             <if test="tag != null">tag,</if>
             <if test="svyTopicId != null">svy_topicid,</if>
             <if test="categoryid != null">categoryid,</if>
+            <if test="topicContent != null and topicContent != ''">topic_content,</if>
+            <if test="suitway != null and suitway != ''">suitway,</if>
+            <if test="isavailable != null and isavailable != ''">isavailable,</if>
+            <if test="language != null and language!=''">language,</if>
+            <if test="otherdata != null and otherdata!=''">otherdata,</if>
+            <if test="valueType != null and valueType!=''">value_type,</if>
+            <if test="reply != null and reply!=''">otherdata,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="oldid != null">#{oldid},</if>
@@ -112,6 +140,13 @@
             <if test="tag != null">#{tag},</if>
             <if test="svyTopicId != null">#{svyTopicId},</if>
             <if test="categoryid != null">#{categoryid},</if>
+            <if test="topicContent != null and topicContent != ''">#{topicContent},</if>
+            <if test="suitway != null  and suitway != ''">#{suitway},</if>
+            <if test="isavailable != null and isavailable != ''">#{isavailable},</if>
+            <if test="language != null  and language!=''">#{language},</if>
+            <if test="otherdata != null and otherdata!=''">#{otherdata},</if>
+            <if test="valueType != null and valueType!=''">#{valueType},</if>
+            <if test="reply != null and reply!=''">#{therdata},</if>
         </trim>
     </insert>
 
@@ -135,15 +170,25 @@
             <if test="isupload != null">isupload = #{isupload},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
             <if test="categoryid != null">categoryid = #{categoryid},</if>
+            <if test="topicContent != null">topic_content = #{topicContent},</if>
+            <if test="suitway != null">suitway = #{suitway},</if>
+            <if test="isavailable != null">isavailable = #{isavailable},</if>
+            <if test="tag != null">tag = #{tag},</if>
+            <if test="language != null and language!=''">language = #{language},</if>
+            <if test="otherdata != null and otherdata!=''">otherdata = #{otherdata},</if>
+            <if test="valueType != null and valueType!=''">value_type = #{valueType},</if>
+            <if test="reply != null and reply!=''">therdata =#{therdata},</if>
         </trim>
         where topicid = #{topicid}
     </update>
 
-    <delete id="deleteSvyLibTopicByTopicid" parameterType="Long">
-        delete
-        from svy_lib_topic
+    <update id="deleteSvyLibTopicByTopicid" parameterType="Long">
+        update svy_lib_topic
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null and delFlag != ''">del_flag =1,</if>
+        </trim>
         where topicid = #{topicid}
-    </delete>
+    </update>
 
     <delete id="deleteSvyLibTopicByTopicids" parameterType="String">
         delete from svy_lib_topic where topicid in
@@ -153,4 +198,4 @@
     </delete>
 
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3