From d5547a93889877dcd9d4ce856739a0571f271b69 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Tue, 21 Nov 2023 17:57:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=A1=A8=E5=92=8C=E7=AD=94?=
 =?UTF-8?q?=E9=A2=98=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=96=B0=E5=A2=9E=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/generatorConfig.xml      |  2 +-
 src/main/resources/mappers/TopicsMapper.xml | 35 +++++++++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml
index 76e9959..e485cc3 100644
--- a/src/main/resources/generatorConfig.xml
+++ b/src/main/resources/generatorConfig.xml
@@ -47,7 +47,7 @@
 <!--        <table tableName="profit_distribution" domainObjectName="ProfitDistribution" />-->
 <!--        <table tableName="profit_management" domainObjectName="ProfitManagement" />-->
 <!--        <table tableName="question_answer" domainObjectName="QuestionAnswer" />-->
-<!--        <table tableName="sys_topics" domainObjectName="Topics" />-->
+        <table tableName="sys_topics" domainObjectName="Topics" />
         <table tableName="topic_record" domainObjectName="TopicRecord" />
 <!--        <table tableName="training_report" domainObjectName="TrainingReport" />-->
 <!--        <table tableName="user_table" domainObjectName="UserTable" />-->
diff --git a/src/main/resources/mappers/TopicsMapper.xml b/src/main/resources/mappers/TopicsMapper.xml
index 391f7b9..11b673c 100644
--- a/src/main/resources/mappers/TopicsMapper.xml
+++ b/src/main/resources/mappers/TopicsMapper.xml
@@ -3,6 +3,7 @@
 <mapper namespace="com.sztzjy.fund_investment.mapper.TopicsMapper">
   <resultMap id="BaseResultMap" type="com.sztzjy.fund_investment.entity.Topics">
     <id column="topic_id" jdbcType="VARCHAR" property="topicId" />
+    <result column="choices" jdbcType="VARCHAR" property="choices" />
     <result column="topic_type" jdbcType="VARCHAR" property="topicType" />
     <result column="source" jdbcType="VARCHAR" property="source" />
     <result column="module" jdbcType="VARCHAR" property="module" />
@@ -71,7 +72,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    topic_id, topic_type, source, module, answer, school_id
+    topic_id, choices, topic_type, source, module, answer, school_id
   </sql>
   <sql id="Blob_Column_List">
     topic_content
@@ -125,12 +126,12 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.sztzjy.fund_investment.entity.Topics">
-    insert into sys_topics (topic_id, topic_type, source, 
-      module, answer, school_id, 
-      topic_content)
-    values (#{topicId,jdbcType=VARCHAR}, #{topicType,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, 
-      #{module,jdbcType=VARCHAR}, #{answer,jdbcType=VARCHAR}, #{schoolId,jdbcType=VARCHAR}, 
-      #{topicContent,jdbcType=LONGVARCHAR})
+    insert into sys_topics (topic_id, choices, topic_type, 
+      source, module, answer, 
+      school_id, topic_content)
+    values (#{topicId,jdbcType=VARCHAR}, #{choices,jdbcType=VARCHAR}, #{topicType,jdbcType=VARCHAR}, 
+      #{source,jdbcType=VARCHAR}, #{module,jdbcType=VARCHAR}, #{answer,jdbcType=VARCHAR}, 
+      #{schoolId,jdbcType=VARCHAR}, #{topicContent,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sztzjy.fund_investment.entity.Topics">
     insert into sys_topics
@@ -138,6 +139,9 @@
       <if test="topicId != null">
         topic_id,
       </if>
+      <if test="choices != null">
+        choices,
+      </if>
       <if test="topicType != null">
         topic_type,
       </if>
@@ -161,6 +165,9 @@
       <if test="topicId != null">
         #{topicId,jdbcType=VARCHAR},
       </if>
+      <if test="choices != null">
+        #{choices,jdbcType=VARCHAR},
+      </if>
       <if test="topicType != null">
         #{topicType,jdbcType=VARCHAR},
       </if>
@@ -193,6 +200,9 @@
       <if test="record.topicId != null">
         topic_id = #{record.topicId,jdbcType=VARCHAR},
       </if>
+      <if test="record.choices != null">
+        choices = #{record.choices,jdbcType=VARCHAR},
+      </if>
       <if test="record.topicType != null">
         topic_type = #{record.topicType,jdbcType=VARCHAR},
       </if>
@@ -219,6 +229,7 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update sys_topics
     set topic_id = #{record.topicId,jdbcType=VARCHAR},
+      choices = #{record.choices,jdbcType=VARCHAR},
       topic_type = #{record.topicType,jdbcType=VARCHAR},
       source = #{record.source,jdbcType=VARCHAR},
       module = #{record.module,jdbcType=VARCHAR},
@@ -232,6 +243,7 @@
   <update id="updateByExample" parameterType="map">
     update sys_topics
     set topic_id = #{record.topicId,jdbcType=VARCHAR},
+      choices = #{record.choices,jdbcType=VARCHAR},
       topic_type = #{record.topicType,jdbcType=VARCHAR},
       source = #{record.source,jdbcType=VARCHAR},
       module = #{record.module,jdbcType=VARCHAR},
@@ -244,6 +256,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.sztzjy.fund_investment.entity.Topics">
     update sys_topics
     <set>
+      <if test="choices != null">
+        choices = #{choices,jdbcType=VARCHAR},
+      </if>
       <if test="topicType != null">
         topic_type = #{topicType,jdbcType=VARCHAR},
       </if>
@@ -267,7 +282,8 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.sztzjy.fund_investment.entity.Topics">
     update sys_topics
-    set topic_type = #{topicType,jdbcType=VARCHAR},
+    set choices = #{choices,jdbcType=VARCHAR},
+      topic_type = #{topicType,jdbcType=VARCHAR},
       source = #{source,jdbcType=VARCHAR},
       module = #{module,jdbcType=VARCHAR},
       answer = #{answer,jdbcType=VARCHAR},
@@ -277,7 +293,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.sztzjy.fund_investment.entity.Topics">
     update sys_topics
-    set topic_type = #{topicType,jdbcType=VARCHAR},
+    set choices = #{choices,jdbcType=VARCHAR},
+      topic_type = #{topicType,jdbcType=VARCHAR},
       source = #{source,jdbcType=VARCHAR},
       module = #{module,jdbcType=VARCHAR},
       answer = #{answer,jdbcType=VARCHAR},