From de94050a3627ce353dd9c16faea551ac6c28a801 Mon Sep 17 00:00:00 2001 From: hshansha Date: Fri, 20 Jun 2025 16:31:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E9=AA=8C=E8=AF=81=E3=80=81?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/kaohe/controller/KhPingceController.java | 4 +++- .../src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java index a6bbc8a..72718bb 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java @@ -119,7 +119,9 @@ public class KhPingceController extends BaseController query.setPcId(khPingce.getId()); List temItems = pcEmpService.selectKhPcEmpList(query); List ids = temItems.stream().map(KhPcEmp::getId).collect(Collectors.toList()); - pcEmpService.deleteKhPcEmpByIds(ids.toArray(new Long[ids.size()])); + if(ids!=null&&ids.size()>0){ + pcEmpService.deleteKhPcEmpByIds(ids.toArray(new Long[ids.size()])); + } //增加新的关联 for(KhEmployee item:pcEmps){ KhPcEmp pcEmp = new KhPcEmp(); 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 434e4c1..a139c25 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 @@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 投票记录对象 kh_vote_recard @@ -50,8 +51,9 @@ public class KhVoteRecard extends BaseEntity private BigDecimal voteScore; /** 投票时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "投票时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "投票时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date voteTime; /** IP地址 */