From 8cfc2885c49a961baeea0cc08cbdbf2dfca7f151 Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Mon, 17 Nov 2025 16:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E5=88=86=E8=AE=B0=E5=BD=95=E3=80=81?=
 =?UTF-8?q?=E8=A2=AB=E8=80=83=E6=A0=B8=E5=AF=B9=E8=B1=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/kaohe/domain/KhVoteEmp.java     | 14 +++++++++++++-
 .../java/com/ruoyi/kaohe/domain/KhVoteRecard.java  |  4 ++--
 .../kaohe/service/impl/KhVoteEmpServiceImpl.java   |  1 +
 .../resources/mapper/kaohe/KhVoteEmpMapper.xml     |  8 +++++---
 .../resources/mapper/kaohe/KhVoteRecardMapper.xml  |  4 ++--
 5 files changed, 23 insertions(+), 8 deletions(-)

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 e4e214f..57655ac 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
@@ -24,9 +24,13 @@ public class KhVoteEmp extends BaseEntity
     private Long khitemTypeid;
 
     /** 投票id */
-    @Excel(name = "投票id")
+   // @Excel(name = "投票id")
     private Long voteId;
 
+    /** 考核任务 */
+    @Excel(name = "考核任务")
+    private String pcName;
+
     /** 投票主题 */
     @Excel(name = "投票主题")
     private String voteTitle;
@@ -96,6 +100,14 @@ public class KhVoteEmp extends BaseEntity
         return version;
     }
 
+    public String getPcName() {
+        return pcName;
+    }
+
+    public void setPcName(String pcName) {
+        this.pcName = pcName;
+    }
+
     public void setVersion(Integer version) {
         this.version = version;
     }
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java
index 92f3637..ebdfe73 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java
@@ -62,8 +62,8 @@ public class KhVoteRecard extends BaseEntity
     private String voteDetails;
 
     /** 投票时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "投票时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "投票时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date voteTime;
 
     /** IP */
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java
index 0317835..cb6ca5f 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java
@@ -189,6 +189,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
         recard.setVoteId(param.getVoteId());
         recard.setUserId(param.getUserId());
         recard.setUserName(param.getUserName());
+        recard.setVoteTime(nowDate);
 
         //选项评分
         if (typeid.equals(1L)) {
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
index ac03bb0..137ffc5 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
@@ -9,6 +9,7 @@
         <result property="khitemTypeid" column="khitem_typeId"/>
         <result property="voteId" column="vote_id"/>
         <result property="voteTitle" column="vote_title"/>
+        <result property="pcName"    column="pingce_name"    />
         <result property="bkhdxId" column="bkhdx_id"/>
         <result property="bkhdxName" column="bkhdx_name"/>
         <result property="content" column="content"/>
@@ -56,19 +57,20 @@
     </sql>
 
     <select id="selectKhVoteEmpList" parameterType="KhVoteEmp" resultMap="KhVoteEmpResult">
-        <include refid="selectKhVoteEmpVo"/>
+        select ve.* ,ve.pingce_name from kh_vote_emp join kh_vote v on ve.voteId=v.id
         <where>
             <if test="khitemTypeid != null ">and khitem_typeId = #{khitemTypeid}</if>
             <if test="voteId != null ">and vote_id = #{voteId}</if>
             <if test="voteTitle != null  and voteTitle != ''">and vote_title = #{voteTitle}</if>
+            <if test="pcName != null and pcName != '' "> and ve.pingce_name like concat('%', #{pcName}, '%')</if>
             <if test="bkhdxId != null ">and bkhdx_id = #{bkhdxId}</if>
             <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="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="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>
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteRecardMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteRecardMapper.xml
index 736bf73..b159b27 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteRecardMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteRecardMapper.xml
@@ -42,8 +42,8 @@
             <if test="userName != null  and userName != ''"> and r.user_name like concat('%', #{userName}, '%')</if>
             <if test="uid != null "> and r.uid = #{uid}</if>
             <if test="tprName != null  and tprName != ''"> and r.tpr_name like concat('%', #{tprName}, '%')</if>
-           <!-- <if test="voteDetails != null  and voteDetails != ''"> and r.vote_details = #{voteDetails}</if>-->
-            <if test="voteTime != null "> and r.vote_time = #{voteTime}</if>
+            <if test="voteDetails != null  and voteDetails != ''"> and r.vote_details like concat('%', #{voteDetails}, '%')</if>
+            <if test="voteTime != null "> and DATE_FORMAT(r.vote_time, '%Y-%m-%d') = DATE_FORMAT(#{voteTime}, '%Y-%m-%d') </if>
             <if test="ipAddress != null  and ipAddress != ''"> and r.ip_address = #{ipAddress}</if>
         </where>
     </select>