From 78d69b87ede749f14a35056f2fa622f240035194 Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Fri, 20 Jun 2025 09:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E8=AF=84=E6=B5=8B=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=85=B3=E8=81=94=E6=9F=A5=E5=87=BAtypeId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/kaohe/domain/KhVote.java   | 10 ++++++++++
 .../src/main/resources/mapper/kaohe/KhVoteMapper.xml   |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java
index b86e060..6e133ec 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java
+++ b/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;
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
index 5784566..852ebc6 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
+++ b/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 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,7 +47,7 @@
     </select>
 
     <select id="selectKhVoteById" parameterType="Long" resultMap="KhVoteResult">
-        <include refid="selectKhVoteVo"/>
+        select v.*,it.type_id from kh_vote v left join kh_items on   v.khitem_id =it.id
         where id = #{id}
     </select>