From c20ee612a2fab2f62f1c420564e1f9a3f2c4023e Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Thu, 30 Oct 2025 14:39:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E8=B4=A6=E5=8F=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A6=96=E9=A1=B5=E8=AE=BF=E9=97=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/kaohe/controller/KhVoteController.java | 14 +++++++++++++-
 .../main/java/com/ruoyi/kaohe/domain/KhVote.java | 11 +++++++++++
 .../com/ruoyi/kaohe/mapper/KhVoteMapper.java     |  2 ++
 .../com/ruoyi/kaohe/service/IKhVoteService.java  |  2 ++
 .../kaohe/service/impl/KhVoteServiceImpl.java    |  3 +++
 .../main/resources/mapper/kaohe/KhVoteMapper.xml | 16 +++++++++++++++-
 6 files changed, 46 insertions(+), 2 deletions(-)

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 1e5eeab..c2d267a 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
@@ -112,7 +112,7 @@ public class KhVoteController extends BaseController {
     }
 
     /**
-     * 首页根据pingceId、itemIds、state查询投票评测列表
+     * 职工首页根据pingceId、itemIds、state查询投票评测列表————废弃
      */
     @PreAuthorize("@ss.hasPermi('kaohe:vote:list')")
     @GetMapping("/listByConditons")
@@ -122,6 +122,18 @@ public class KhVoteController extends BaseController {
         List<KhVote> list = khVoteService.getListByPcIdAndItemIds(khVote);
         return getDataTable(list);
     }
+    /**
+     * 评价账号登录首页根据pingceId、itemIds、state查询投票评测列表
+     * 参数: voteIds
+     */
+    @PreAuthorize("@ss.hasPermi('kaohe:vote:list')")
+    @GetMapping("/ListByVoteIds")
+    public TableDataInfo getListByVoteIds(KhVote khVote) {
+        khVote.setState("2");
+        startPage();
+        List<KhVote> list = khVoteService.getListByVoteIds(khVote);
+        return getDataTable(list);
+    }
 
     /**
      * 导出投票评测列表
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 3875ebd..55df608 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
@@ -100,6 +100,17 @@ public class KhVote extends BaseEntity
      */
     private  List<KhVoteEmp> voteEmps;
 
+    //首页查询评分任务的参数
+    private List<Long> voteIds;
+
+    public List<Long> getVoteIds() {
+        return voteIds;
+    }
+
+    public void setVoteIds(List<Long> voteIds) {
+        this.voteIds = voteIds;
+    }
+
     public Integer getUmax() {
         return umax;
     }
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhVoteMapper.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhVoteMapper.java
index 18ea116..f9f0390 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhVoteMapper.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhVoteMapper.java
@@ -62,4 +62,6 @@ public interface KhVoteMapper
     List<KhVote> getListByPcIdAndItemIds(KhVote khVote);
 
     List<KhVote> selectUnfinishedVote();
+
+    List<KhVote> getListByVoteIds(KhVote khVote);
 }
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteService.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteService.java
index 7c413bb..f6201c6 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteService.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteService.java
@@ -62,4 +62,6 @@ public interface IKhVoteService
     List<KhVote> getListByPcIdAndItemIds(KhVote khVote);
 
     List<KhVote> selectUnfinishedVote();
+
+    List<KhVote> getListByVoteIds(KhVote khVote);
 }
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteServiceImpl.java
index 943fdf0..a76ff79 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteServiceImpl.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteServiceImpl.java
@@ -114,6 +114,9 @@ public class KhVoteServiceImpl implements IKhVoteService
     public List<KhVote> getListByPcIdAndItemIds(KhVote khVote) {
         return khVoteMapper.getListByPcIdAndItemIds(khVote);
     }
+    public List<KhVote> getListByVoteIds(KhVote khVote) {
+        return khVoteMapper.getListByVoteIds(khVote);
+    }
 
     @Override
     public List<KhVote> selectUnfinishedVote() {
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
index 69d6a1c..0c842ed 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
@@ -55,7 +55,7 @@
             <if test="samePercent != null  and samePercent != ''"> and same_percent = #{samePercent}</if>
         </where>
     </select>
-    <!--生成评测账号登录时筛选符合条件的vote展示评分-->
+    <!--生成评测账号登录时筛选符合条件的vote展示评分     ————废弃————   -->
     <select id="getListByPcIdAndItemIds" parameterType="KhVote" resultMap="KhVoteResult">
         select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
         <where>
@@ -69,6 +69,20 @@
             </if>
         </where>
     </select>
+    <!-- 评测账号登录时筛选符合条件的vote展示评分 -->
+    <select id="getListByVoteIds" parameterType="KhVote" resultMap="KhVoteResult">
+        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>
+            <!--状态值传1，也就是展示所有状态不等于2（非完成状态）的数据-->
+            <if test="state != null  and state != ''"> and state != #{state}</if>
+            <if test="voteIds != null"> and v.id in
+                <foreach item="voteId" collection="voteIds" open="(" separator="," close=")">
+                    #{voteId}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
     <select id="selectUnfinishedVote" parameterType="KhVote" resultMap="KhVoteResult">
         select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id