From 00f1622e1279e85871faa62d75d2d85f28819a2f Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Wed, 15 Apr 2026 17:14:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=BC=E5=87=BA=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9D=A3=E5=AF=9F=E6=8E=AA=E6=96=BD=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/pojo/vo/ExportNegativeBlameVo.java       | 9 +++++++++
 .../biutag/supervision/service/NegativeTaskService.java  | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java
index a7d554f..8618bc7 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java
@@ -104,4 +104,13 @@ public class ExportNegativeBlameVo {
     // 问题类型
     @ExcelProperty({"问题类型"})
     private String problemType;
+
+
+    @ExcelProperty("督察措施")
+    private String superviseMeasuresName;
+
+
+    @ExcelProperty({"禁闭时长"})
+    private String confinementTime;
+
 }
diff --git a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java
index b1c5c66..4457755 100644
--- a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java
+++ b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java
@@ -63,6 +63,8 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
 
     private final NegativeBlameService blameService;
 
+    private final ConfinementService confinementService;
+
 
     public Page<NegativeTask> page(NegativeTaskQueryParam param) {
         LambdaQueryWrapper<NegativeTask> queryWrapper = new LambdaQueryWrapper<NegativeTask>()
@@ -203,7 +205,9 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
                     if(AccountabilityTargetEnum.PERSONAL_AND_DEPARTMENT.getLabel().equals(blameVo.getAccountabilityTarget())){
                         blameVo.setAccountabilityTarget(BlameType.personal.name().equals(negativeBlame.getType())?"涉及个人": "涉及单位");
                     }
-
+                    String confinementId = negativeBlame.getConfinementId();
+                    Confinement confinement = confinementService.getById(confinementId);
+                    blameVo.setConfinementTime(confinement.getConfinementTime());
                     blameVoList.add(blameVo);
                 }
                 vo.setFirstApproveTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getFirstApproveTime())));