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] =?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>