From 6d4eb32eaab4c4b292d3e2417501e9d22303b4d5 Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Tue, 1 Jul 2025 17:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8C=89=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=84=E5=88=86=E4=BB=BB=E5=8A=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 511dee6..63c14c3 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
@@ -55,6 +55,17 @@ public class KhVoteController extends BaseController
         List<KhVote> list = khVoteService.selectKhVoteList(khVote);
         return getDataTable(list);
     }
+    /**
+     * 首页根据pingceId、itemIds、state查询投票评测列表
+     */
+    @PreAuthorize("@ss.hasPermi('kaohe:vote:list')")
+    @GetMapping("/listByConditons")
+    public TableDataInfo getListByConditons(KhVote khVote)
+    {
+        startPage();
+        List<KhVote> list = khVoteService.getListByPcIdAndItemIds(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 531a7e1..9af7e57 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
@@ -2,6 +2,8 @@ package com.ruoyi.kaohe.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -74,6 +76,20 @@ public class KhVote extends BaseEntity
     /** 状态(0 未开始 1 进行中 2 完成) */
     @Excel(name = "状态(0 未开始 1 进行中 2 完成)")
     private String state;
+    /**
+     * 仅用作评分账号查看首页对应评分  的参数
+     * @return
+     */
+    private List<Long> itemIds;
+
+
+    public List<Long> getItemIds() {
+        return itemIds;
+    }
+
+    public void setItemIds(List<Long> itemIds) {
+        this.itemIds = itemIds;
+    }
 
     public void setId(Long id)
     {
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 c208300..cb3f5bd 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
@@ -58,4 +58,6 @@ public interface KhVoteMapper
      * @return 结果
      */
     public int deleteKhVoteByIds(Long[] ids);
+
+    List<KhVote> getListByPcIdAndItemIds(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 14d0eca..9365034 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
@@ -58,4 +58,6 @@ public interface IKhVoteService
      * @return 结果
      */
     public int deleteKhVoteById(Long id);
+
+    List<KhVote> getListByPcIdAndItemIds(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 91efb28..c03c5fa 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
@@ -93,4 +93,9 @@ public class KhVoteServiceImpl implements IKhVoteService
     {
         return khVoteMapper.deleteKhVoteById(id);
     }
+
+    @Override
+    public List<KhVote> getListByPcIdAndItemIds(KhVote khVote) {
+        return khVoteMapper.getListByPcIdAndItemIds(khVote);
+    }
 }
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
index 39f8e19..0db0542 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
@@ -49,6 +49,19 @@
         </where>
     </select>
 
+    <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>
+            <if test="pingceId != null "> and pingce_id = #{pingceId}</if>
+            <if test="state != null  and state != ''"> and state = #{state}</if>
+            <if test="itemIds != null"> and khitem_id in
+                <foreach item="itemId" collection="itemIds" open="(" separator="," close=")">
+                    #{itemId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
     <select id="selectKhVoteById" parameterType="Long" resultMap="KhVoteResult">
         select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
         where v.id = #{id}