Browse Source

修改专项和问题的关联方式

lujie 4 months ago
parent
commit
84d56741e4

+ 6 - 23
ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/domain/QuestionSpecial.java

@@ -2,6 +2,8 @@ package com.ruoyi.abuwx.domain;
 
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 
@@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author lujie
  * @author lujie
  * @date 2025-01-07
  * @date 2025-01-07
  */
  */
+@Setter
+@Getter
 public class QuestionSpecial extends BaseEntity {
 public class QuestionSpecial extends BaseEntity {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
@@ -31,29 +35,7 @@ public class QuestionSpecial extends BaseEntity {
     @Excel(name = "显示状态", readConverterExp = "显=示/隐藏")
     @Excel(name = "显示状态", readConverterExp = "显=示/隐藏")
     private String status;
     private String status;
 
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStatus() {
-        return status;
-    }
+    private String questionIds;
 
 
     @Override
     @Override
     public String toString() {
     public String toString() {
@@ -66,6 +48,7 @@ public class QuestionSpecial extends BaseEntity {
                 .append("updateTime", getUpdateTime())
                 .append("updateTime", getUpdateTime())
                 .append("createBy", getCreateBy())
                 .append("createBy", getCreateBy())
                 .append("updateBy", getUpdateBy())
                 .append("updateBy", getUpdateBy())
+                .append("questionIds", getQuestionIds())
                 .toString();
                 .toString();
     }
     }
 }
 }

+ 11 - 7
ruoyi-abuwx/src/main/resources/mapper/question/QuestionSpecialMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.abuwx.mapper.QuestionSpecialMapper">
 <mapper namespace="com.ruoyi.abuwx.mapper.QuestionSpecialMapper">
-    
+
     <resultMap type="QuestionSpecial" id="QuestionSpecialResult">
     <resultMap type="QuestionSpecial" id="QuestionSpecialResult">
         <result property="id"    column="id"    />
         <result property="id"    column="id"    />
         <result property="title"    column="title"    />
         <result property="title"    column="title"    />
@@ -13,25 +13,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateBy"    column="update_by"    />
+        <result property="questionIds"    column="question_ids"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectQuestionSpecialVo">
     <sql id="selectQuestionSpecialVo">
-        select id, title, status, remark, create_time, update_time, create_by, update_by from question_special
+        select id, title, status, remark, create_time, update_time, create_by, update_by, question_ids from question_special
     </sql>
     </sql>
 
 
     <select id="selectQuestionSpecialList" parameterType="QuestionSpecial" resultMap="QuestionSpecialResult">
     <select id="selectQuestionSpecialList" parameterType="QuestionSpecial" resultMap="QuestionSpecialResult">
         <include refid="selectQuestionSpecialVo"/>
         <include refid="selectQuestionSpecialVo"/>
-        <where>  
+        <where>
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
         </where>
         </where>
     </select>
     </select>
-    
+
     <select id="selectQuestionSpecialById" parameterType="Long" resultMap="QuestionSpecialResult">
     <select id="selectQuestionSpecialById" parameterType="Long" resultMap="QuestionSpecialResult">
         <include refid="selectQuestionSpecialVo"/>
         <include refid="selectQuestionSpecialVo"/>
         where id = #{id}
         where id = #{id}
     </select>
     </select>
-        
+
     <insert id="insertQuestionSpecial" parameterType="QuestionSpecial" useGeneratedKeys="true" keyProperty="id">
     <insert id="insertQuestionSpecial" parameterType="QuestionSpecial" useGeneratedKeys="true" keyProperty="id">
         insert into question_special
         insert into question_special
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="questionIds != null">question_ids,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null">#{title},</if>
             <if test="title != null">#{title},</if>
@@ -51,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="questionIds != null">#{questionIds},</if>
          </trim>
          </trim>
     </insert>
     </insert>
 
 
@@ -64,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="questionIds != null">question_ids = #{questionIds},</if>
         </trim>
         </trim>
         where id = #{id}
         where id = #{id}
     </update>
     </update>
@@ -73,9 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
     </delete>
 
 
     <delete id="deleteQuestionSpecialByIds" parameterType="String">
     <delete id="deleteQuestionSpecialByIds" parameterType="String">
-        delete from question_special where id in 
+        delete from question_special where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>
     </delete>
     </delete>
-</mapper>
+</mapper>