From cde16e4d86afb08896a8eeaea8f22cf6f5a94aa5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 04 十二月 2023 10:25:33 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml |  117 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml
index d02d1fc..cb2012a 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml
@@ -1,51 +1,72 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.SvyLibTopicMapper">
-    
+
     <resultMap type="com.smartor.domain.SvyLibTopic" id="SvyLibTopicResult">
-        <result property="topicid"    column="topicid"    />
-        <result property="oldid"    column="oldid"    />
-        <result property="svyid"    column="svyid"    />
-        <result property="topictype"    column="topictype"    />
-        <result property="topiccode"    column="topiccode"    />
-        <result property="topic"    column="topic"    />
-        <result property="sort"    column="sort"    />
-        <result property="ismandatory"    column="ismandatory"    />
-        <result property="ishide"    column="ishide"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="orgid"    column="orgid"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="isupload"    column="isupload"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="tag"    column="tag"    />
+        <result property="topicid" column="topicid"/>
+        <result property="oldid" column="oldid"/>
+        <result property="svyid" column="svyid"/>
+        <result property="topictype" column="topictype"/>
+        <result property="topiccode" column="topiccode"/>
+        <result property="topic" column="topic"/>
+        <result property="sort" column="sort"/>
+        <result property="ismandatory" column="ismandatory"/>
+        <result property="ishide" column="ishide"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="orgid" column="orgid"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="tag" column="tag"/>
     </resultMap>
 
     <sql id="selectSvyLibTopicVo">
-        select topicid, oldid, svyid, topictype, topiccode, topic, sort, ismandatory, ishide, del_flag, orgid, create_by, create_time, update_by, update_time, isupload, upload_time,tag from svy_lib_topic
+        select topicid,
+               oldid,
+               svyid,
+               topictype,
+               topiccode,
+               topic,
+               sort,
+               ismandatory,
+               ishide,
+               del_flag,
+               orgid,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               isupload,
+               upload_time,
+               tag,
+               svy_topicid as svyTopicId
+        from svy_lib_topic
     </sql>
 
-    <select id="selectSvyLibTopicList" parameterType="SvyLibTopic" resultMap="SvyLibTopicResult">
+    <select id="selectSvyLibTopicList" parameterType="com.smartor.domain.SvyLibTopic" resultMap="SvyLibTopicResult">
         <include refid="selectSvyLibTopicVo"/>
-        <where>  
-            <if test="oldid != null "> and oldid = #{oldid}</if>
-            <if test="topictype != null "> and topictype = #{topictype}</if>
-            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
-            <if test="ishide != null "> and ishide = #{ishide}</if>
-            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
+        <where>
+            <if test="oldid != null ">and oldid = #{oldid}</if>
+            <if test="topictype != null ">and topictype = #{topictype}</if>
+            <if test="topic != null  and topic != ''">and topic = #{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>
         </where>
     </select>
-    
+
     <select id="selectSvyLibTopicByTopicid" parameterType="Long" resultMap="SvyLibTopicResult">
         <include refid="selectSvyLibTopicVo"/>
         where topicid = #{topicid}
     </select>
-        
-    <insert id="insertSvyLibTopic" parameterType="SvyLibTopic" useGeneratedKeys="true" keyProperty="topicid">
+
+    <insert id="insertSvyLibTopic" parameterType="com.smartor.domain.SvyLibTopic" useGeneratedKeys="true"
+            keyProperty="topicid">
         insert into svy_lib_topic
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="oldid != null">oldid,</if>
@@ -65,7 +86,8 @@
             <if test="isupload != null">isupload,</if>
             <if test="uploadTime != null">upload_time,</if>
             <if test="tag != null">tag,</if>
-         </trim>
+            <if test="svyTopicId != null">svy_topicid,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="oldid != null">#{oldid},</if>
             <if test="svyid != null">#{svyid},</if>
@@ -84,10 +106,11 @@
             <if test="isupload != null">#{isupload},</if>
             <if test="uploadTime != null">#{uploadTime},</if>
             <if test="tag != null">#{tag},</if>
-         </trim>
+            <if test="svyTopicId != null">#{svyTopicId},</if>
+        </trim>
     </insert>
 
-    <update id="updateSvyLibTopic" parameterType="SvyLibTopic">
+    <update id="updateSvyLibTopic" parameterType="com.smartor.domain.SvyLibTopic">
         update svy_lib_topic
         <trim prefix="SET" suffixOverrides=",">
             <if test="oldid != null">oldid = #{oldid},</if>
@@ -111,31 +134,17 @@
     </update>
 
     <delete id="deleteSvyLibTopicByTopicid" parameterType="Long">
-        delete from svy_lib_topic where topicid = #{topicid}
+        delete
+        from svy_lib_topic
+        where topicid = #{topicid}
     </delete>
 
     <delete id="deleteSvyLibTopicByTopicids" parameterType="String">
-        delete from svy_lib_topic where topicid in 
+        delete from svy_lib_topic where topicid in
         <foreach item="topicid" collection="array" open="(" separator="," close=")">
             #{topicid}
         </foreach>
     </delete>
 
-    <select id="showTopic" resultType="com.smartor.domain.SvyLibTopicAndOptionRes"
-            parameterType="com.smartor.domain.SvyTopicReq">
-        SELECT a.topicid, a.topiccode, a.topic, a.topictype, a.tag, b.optioncode, b.optioncontent
-        FROM svy_lib_topic a,
-        svy_lib_topicoption b
-        WHERE a.topicid = b.topicid
-        <if test="topic != null and topic != ''">
-            and a.topic LIKE concat('%', #{topic}, '%')
-        </if>
-        <if test="topicType != null and topicType != ''">
-            and a.topictype = #{topicType}
-        </if>
-        <if test="tag != null and tag != ''">
-            and a.tag LIKE concat('%', #{tag}, '%')
-        </if>
-        GROUP BY a.topic, b.optioncode
-    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3