Merge remote-tracking branch 'origin/main'

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java

@@ -67,6 +67,16 @@ public class KhVote extends BaseEntity
     @Excel(name = "状态(0 未开始 1 进行中 2 完成)")
     private String state;
 
+    private String typeId;
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml

@@ -17,6 +17,7 @@
         <result property="maxNum"    column="max_num"    />
         <result property="percentage"    column="percentage"    />
         <result property="state"    column="state"    />
+        <result property="typeId"    column="type_id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -29,7 +30,7 @@
     </sql>
 
     <select id="selectKhVoteList" parameterType="KhVote" resultMap="KhVoteResult">
-        <include refid="selectKhVoteVo"/>
+        select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
         <where>
             <if test="pingceId != null "> and pingce_id = #{pingceId}</if>
             <if test="pingceName != null  and pingceName != ''"> and pingce_name like concat('%', #{pingceName}, '%')</if>
@@ -46,8 +47,8 @@
     </select>
 
     <select id="selectKhVoteById" parameterType="Long" resultMap="KhVoteResult">
-        <include refid="selectKhVoteVo"/>
+        select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
-        where id = #{id}
+        where v.id = #{id}
     </select>
 
     <insert id="insertKhVote" parameterType="KhVote" useGeneratedKeys="true" keyProperty="id">