From 817379fc8e3f4b36a038d793613691ce4bcf8647 Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Wed, 2 Jul 2025 17:12:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2typeid=E3=80=81type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KhTemplateController.java      |  2 +
 .../java/com/ruoyi/kaohe/domain/KhItems.java  |  2 +-
 .../com/ruoyi/kaohe/domain/KhTemItem.java     | 26 ++++++++++-
 .../mapper/kaohe/KhTemItemMapper.xml          | 12 ++++-
 .../mapper/kaohe/KhTemplateMapper.xml         | 44 +++++++++++--------
 5 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java
index 861ca3c..deab0e5 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java
@@ -115,6 +115,8 @@ public class KhTemplateController extends BaseController
                 temItem.setTemId(khTemplate.getId());
                 temItem.setItemName(item.getItemName());
                 temItem.setKhitemId(item.getId());
+                temItem.setType(item.getType());
+                temItem.setTypeId(item.getTypeId());
                 temItemService.insertKhTemItem(temItem);
             }
         }
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhItems.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhItems.java
index 8edb18a..1f8f7f2 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhItems.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhItems.java
@@ -23,7 +23,7 @@ public class KhItems extends BaseEntity
     private String itemName;
 
     /** 考核类型id */
-    @Excel(name = "考核类型id")
+   // @Excel(name = "考核类型id")
     private Long typeId;
 
     /** 考核类型 */
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java
index 8d984d4..49fe383 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java
@@ -34,7 +34,31 @@ public class KhTemItem extends BaseEntity
     @Excel(name = "模板id")
     private Long temId;
 
-    public void setId(Long id) 
+    /** 考核类型id */
+    // @Excel(name = "考核类型id")
+    private Long typeId;
+
+    /** 考核类型 */
+    @Excel(name = "考核类型")
+    private String type;
+
+    public Long getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Long typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml
index 7dbc28c..48dff6a 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml
@@ -10,10 +10,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="khitemId"    column="khitem_id"    />
         <result property="itemName"    column="item_name"    />
         <result property="temId"    column="tem_id"    />
+        <result property="typeId"    column="type_id"    />
+        <result property="type"    column="type"    />
     </resultMap>
 
     <sql id="selectKhTemItemVo">
-        select id, tem_name, khitem_id, item_name, tem_id from kh_tem_item
+        select id, tem_name, khitem_id, item_name, tem_id, type_id, type from kh_tem_item
     </sql>
 
     <select id="selectKhTemItemList" parameterType="KhTemItem" resultMap="KhTemItemResult">
@@ -23,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khitemId != null "> and khitem_id = #{khitemId}</if>
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="temId != null "> and tem_id = #{temId}</if>
+            <if test="typeId != null "> and type_id = #{typeId}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
         </where>
     </select>
     
@@ -38,12 +42,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khitemId != null">khitem_id,</if>
             <if test="itemName != null and itemName != ''">item_name,</if>
             <if test="temId != null">tem_id,</if>
+            <if test="typeId != null">type_id,</if>
+            <if test="type != null">type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="temName != null and temName != ''">#{temName},</if>
             <if test="khitemId != null">#{khitemId},</if>
             <if test="itemName != null and itemName != ''">#{itemName},</if>
             <if test="temId != null">#{temId},</if>
+            <if test="typeId != null">#{typeId},</if>
+            <if test="type != null">#{type},</if>
          </trim>
     </insert>
 
@@ -54,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khitemId != null">khitem_id = #{khitemId},</if>
             <if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
             <if test="temId != null">tem_id = #{temId},</if>
+            <if test="typeId != null">type_id = #{typeId},</if>
+            <if test="type != null">type = #{type},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml
index 5df4be1..eaa0186 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml
@@ -1,39 +1,43 @@
 <?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.ruoyi.kaohe.mapper.KhTemplateMapper">
-    
+
     <resultMap type="KhTemplate" id="KhTemplateResult">
-        <result property="id"    column="id"    />
-        <result property="temName"    column="tem_name"    />
-        <collection  property="items" ofType="KhItems " javaType="ArrayList" select="getItems" column="id"/>
+        <result property="id" column="id"/>
+        <result property="temName" column="tem_name"/>
+        <collection property="items" ofType="KhItems " javaType="ArrayList" select="getItems" column="id"/>
     </resultMap>
 
     <resultMap id="KhItemsResult" type="KhItems">
-        <result property="id"    column="itemId"    />
-        <result property="itemName"    column="khitemName"  />
+        <result property="id" column="itemId"/>
+        <result property="itemName" column="khitemName"/>
+        <result property="type" column="type"/>
+        <result property="typeId" column="type_id"/>
     </resultMap>
 
     <sql id="selectKhTemplateVo">
-        select id, tem_name, khitem_id, item_name from kh_template
+        select id, tem_name, khitem_id, item_name
+        from kh_template
     </sql>
 
     <select id="selectKhTemplateList" parameterType="KhTemplate" resultMap="KhTemplateResult">
-        /*select t.*,ti.khitem_id itemId ,ti.item_name khitemName from kh_template t left join kh_tem_item ti on t.id=ti.tem_id*/
+        /*select t.*,ti.khitem_id itemId ,ti.item_name khitemName from kh_template t left join kh_tem_item ti on
+        t.id=ti.tem_id*/
         <include refid="selectKhTemplateVo"/>
         <where>
-            <if test="temName != null  and temName != ''"> and tem_name like concat('%', #{temName}, '%')</if>
+            <if test="temName != null  and temName != ''">and tem_name like concat('%', #{temName}, '%')</if>
         </where>
     </select>
 
-    <select id="getItems"  resultMap="KhItemsResult">
-    select ti.khitem_id itemId ,ti.item_name khitemName  from kh_tem_item ti
+    <select id="getItems" resultMap="KhItemsResult">
+        select ti.khitem_id itemId ,ti.item_name khitemName ,type,type_id from kh_tem_item ti
         <where>
-             <if test="id != null ">  ti.tem_id = #{id}</if>
+            <if test="id != null ">ti.tem_id = #{id}</if>
         </where>
     </select>
-    
+
     <select id="selectKhTemplateById" parameterType="Long" resultMap="KhTemplateResult">
         <include refid="selectKhTemplateVo"/>
         where id = #{id}
@@ -45,12 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="temName != null and temName != ''">tem_name,</if>
             <if test="khitemId != null">khitem_id,</if>
             <if test="itemName != null and itemName != ''">item_name,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="temName != null and temName != ''">#{temName},</if>
             <if test="khitemId != null">#{khitemId},</if>
             <if test="itemName != null and itemName != ''">#{itemName},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateKhTemplate" parameterType="KhTemplate">
@@ -64,11 +68,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteKhTemplateById" parameterType="Long">
-        delete from kh_template where id = #{id}
+        delete
+        from kh_template
+        where id = #{id}
     </delete>
 
     <delete id="deleteKhTemplateByIds" parameterType="String">
-        delete from kh_template where id in 
+        delete from kh_template where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

From 768623987175fee9b9ec7c16087c5d34142b6fb9 Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Thu, 3 Jul 2025 16:51:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kaohe/controller/KhVoteController.java    |  1 +
 .../com/ruoyi/kaohe/domain/KhVoteEmp.java     | 52 +++++++++++++++++++
 .../mapper/kaohe/KhVoteEmpMapper.xml          | 22 +++++++-
 3 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java
index 3978e4d..d08dffd 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java
@@ -136,6 +136,7 @@ public class KhVoteController extends BaseController {
             voteEmp.setVoteId(khVote.getId());
             voteEmp.setVoteTitle(khVote.getVoteTitle());
             voteEmp.setPercentage(khVote.getPercentage());
+            voteEmp.setKhitemTypeid(khVote.getKhitemTypeid());
             voteEmpService.insertKhVoteEmp(voteEmp);
         }
         return AjaxResult.success();
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java
index 5ff2fd9..e41df40 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java
@@ -43,6 +43,22 @@ public class KhVoteEmp extends BaseEntity
     @Excel(name = "选项内容")
     private String content;
 
+    /** 优秀 */
+    @Excel(name = "优秀")
+    private Long optionA;
+
+    /** 合格 */
+    @Excel(name = "合格")
+    private Long optionB;
+
+    /** 基本合格 */
+    @Excel(name = "基本合格")
+    private Long optionC;
+
+    /** 不合格 */
+    @Excel(name = "不合格")
+    private Long optionD;
+
     /** 投票人数 */
     @Excel(name = "投票人数")
     private Long voteNum;
@@ -183,6 +199,38 @@ public class KhVoteEmp extends BaseEntity
         return endScore;
     }
 
+    public Long getOptionA() {
+        return optionA;
+    }
+
+    public void setOptionA(Long optionA) {
+        this.optionA = optionA;
+    }
+
+    public Long getOptionB() {
+        return optionB;
+    }
+
+    public void setOptionB(Long optionB) {
+        this.optionB = optionB;
+    }
+
+    public Long getOptionC() {
+        return optionC;
+    }
+
+    public void setOptionC(Long optionC) {
+        this.optionC = optionC;
+    }
+
+    public Long getOptionD() {
+        return optionD;
+    }
+
+    public void setOptionD(Long optionD) {
+        this.optionD = optionD;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -194,6 +242,10 @@ public class KhVoteEmp extends BaseEntity
                 .append("bkhdxName", getBkhdxName())
                 .append("content", getContent())
                 .append("voteNum", getVoteNum())
+                .append("optionA", getOptionA())
+                .append("optionB", getOptionB())
+                .append("optionC", getOptionC())
+                .append("optionD", getOptionD())
                 .append("voteScore", getVoteScore())
                 .append("avgScore", getAvgScore())
                 .append("percentage", getPercentage())
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
index bec70e7..47becc9 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
@@ -13,6 +13,10 @@
         <result property="bkhdxName"    column="bkhdx_name"    />
         <result property="content"    column="content"    />
         <result property="voteNum"    column="vote_num"    />
+        <result property="optionA"    column="option_a"    />
+        <result property="optionB"    column="option_b"    />
+        <result property="optionC"    column="option_c"    />
+        <result property="optionD"    column="option_d"    />
         <result property="voteScore"    column="vote_score"    />
         <result property="avgScore"    column="avg_score"    />
         <result property="percentage"    column="percentage"    />
@@ -25,7 +29,7 @@
     </resultMap>
 
     <sql id="selectKhVoteEmpVo">
-        select id, khitem_typeId, vote_id, vote_title, bkhdx_id, bkhdx_name, content, vote_num, vote_score, avg_score, percentage, end_score, create_by, create_time, update_by, update_time, remark from kh_vote_emp
+        select id, khitem_typeId, vote_id, vote_title, bkhdx_id, bkhdx_name, content, vote_num,option_a, option_b, option_c, option_d, vote_score, avg_score, percentage, end_score, create_by, create_time, update_by, update_time, remark from kh_vote_emp
     </sql>
 
     <select id="selectKhVoteEmpList" parameterType="KhVoteEmp" resultMap="KhVoteEmpResult">
@@ -38,6 +42,10 @@
             <if test="bkhdxName != null  and bkhdxName != ''"> and bkhdx_name like concat('%', #{bkhdxName}, '%')</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="voteNum != null "> and vote_num = #{voteNum}</if>
+            <if test="optionA != null "> and option_a = #{optionA}</if>
+            <if test="optionB != null "> and option_b = #{optionB}</if>
+            <if test="optionC != null "> and option_c = #{optionC}</if>
+            <if test="optionD != null "> and option_d = #{optionD}</if>
             <if test="voteScore != null "> and vote_score = #{voteScore}</if>
             <if test="avgScore != null "> and avg_score = #{avgScore}</if>
             <if test="percentage != null "> and percentage = #{percentage}</if>
@@ -60,6 +68,10 @@
             <if test="bkhdxName != null">bkhdx_name,</if>
             <if test="content != null">content,</if>
             <if test="voteNum != null">vote_num,</if>
+            <if test="optionA != null">option_a,</if>
+            <if test="optionB != null">option_b,</if>
+            <if test="optionC != null">option_c,</if>
+            <if test="optionD != null">option_d,</if>
             <if test="voteScore != null">vote_score,</if>
             <if test="avgScore != null">avg_score,</if>
             <if test="percentage != null">percentage,</if>
@@ -78,6 +90,10 @@
             <if test="bkhdxName != null">#{bkhdxName},</if>
             <if test="content != null">#{content},</if>
             <if test="voteNum != null">#{voteNum},</if>
+            <if test="optionA != null">#{optionA},</if>
+            <if test="optionB != null">#{optionB},</if>
+            <if test="optionC != null">#{optionC},</if>
+            <if test="optionD != null">#{optionD},</if>
             <if test="voteScore != null">#{voteScore},</if>
             <if test="avgScore != null">#{avgScore},</if>
             <if test="percentage != null">#{percentage},</if>
@@ -100,6 +116,10 @@
             <if test="bkhdxName != null">bkhdx_name = #{bkhdxName},</if>
             <if test="content != null">content = #{content},</if>
             <if test="voteNum != null">vote_num = #{voteNum},</if>
+            <if test="optionA != null">option_a = #{optionA},</if>
+            <if test="optionB != null">option_b = #{optionB},</if>
+            <if test="optionC != null">option_c = #{optionC},</if>
+            <if test="optionD != null">option_d = #{optionD},</if>
             <if test="voteScore != null">vote_score = #{voteScore},</if>
             <if test="avgScore != null">avg_score = #{avgScore},</if>
             <if test="percentage != null">percentage = #{percentage},</if>

From 3eaf4fbd95b876fc31c7bc6b4d8263f6599f598e Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Thu, 3 Jul 2025 16:55:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=88=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/kaohe/domain/KhVoteItems.java   | 43 +++++++++++++------
 .../mapper/kaohe/KhVoteItemsMapper.xml        | 23 ++++++----
 2 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteItems.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteItems.java
index c859f6f..86e5ef7 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteItems.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteItems.java
@@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 投票项对象 kh_vote_items
- * 
+ *
  * @author hs
- * @date 2025-06-24
+ * @date 2025-07-03
  */
 public class KhVoteItems extends BaseEntity
 {
@@ -22,36 +22,51 @@ public class KhVoteItems extends BaseEntity
     @Excel(name = "投票选项名称")
     private String vitemName;
 
-    public void setId(Long id) 
+    /** 分数 */
+    @Excel(name = "分数")
+    private Long score;
+
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
 
-    public void setVitemName(String vitemName) 
+    public void setVitemName(String vitemName)
     {
         this.vitemName = vitemName;
     }
 
-    public String getVitemName() 
+    public String getVitemName()
     {
         return vitemName;
     }
 
+    public void setScore(Long score)
+    {
+        this.score = score;
+    }
+
+    public Long getScore()
+    {
+        return score;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("vitemName", getVitemName())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+                .append("id", getId())
+                .append("vitemName", getVitemName())
+                .append("score", getScore())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteItemsMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteItemsMapper.xml
index 18c54d2..589d4c3 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteItemsMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteItemsMapper.xml
@@ -1,12 +1,13 @@
 <?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.ruoyi.kaohe.mapper.KhVoteItemsMapper">
-    
+
     <resultMap type="KhVoteItems" id="KhVoteItemsResult">
         <result property="id"    column="id"    />
         <result property="vitemName"    column="vitem_name"    />
+        <result property="score"    column="score"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -15,16 +16,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectKhVoteItemsVo">
-        select id, vitem_name, create_by, create_time, update_by, update_time, remark from kh_vote_items
+        select id, vitem_name, score, create_by, create_time, update_by, update_time, remark from kh_vote_items
     </sql>
 
     <select id="selectKhVoteItemsList" parameterType="KhVoteItems" resultMap="KhVoteItemsResult">
         <include refid="selectKhVoteItemsVo"/>
-        <where>  
+        <where>
             <if test="vitemName != null  and vitemName != ''"> and vitem_name like concat('%', #{vitemName}, '%')</if>
+            <if test="score != null "> and score = #{score}</if>
         </where>
     </select>
-    
+
     <select id="selectKhVoteItemsById" parameterType="Long" resultMap="KhVoteItemsResult">
         <include refid="selectKhVoteItemsVo"/>
         where id = #{id}
@@ -34,26 +36,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into kh_vote_items
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="vitemName != null">vitem_name,</if>
+            <if test="score != null">score,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="vitemName != null">#{vitemName},</if>
+            <if test="score != null">#{score},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateKhVoteItems" parameterType="KhVoteItems">
         update kh_vote_items
         <trim prefix="SET" suffixOverrides=",">
             <if test="vitemName != null">vitem_name = #{vitemName},</if>
+            <if test="score != null">score = #{score},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -68,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteKhVoteItemsByIds" parameterType="String">
-        delete from kh_vote_items where id in 
+        delete from kh_vote_items where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>