From 54a24d9aee17492c9e78422034a29aa92488f39c Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Tue, 7 Apr 2026 14:59:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=AB=8B=E5=8D=B3=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=88=9D=E6=A0=B8=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/pojo/domain/NegativeDetail.java |  6 ++++++
 .../ComplaintCollectionPageDTO.java             | 17 +++++++++++++++++
 .../supervision/service/NegativeService.java    | 14 ++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/src/main/java/com/biutag/supervision/pojo/domain/NegativeDetail.java b/src/main/java/com/biutag/supervision/pojo/domain/NegativeDetail.java
index 0df4b43..99943aa 100644
--- a/src/main/java/com/biutag/supervision/pojo/domain/NegativeDetail.java
+++ b/src/main/java/com/biutag/supervision/pojo/domain/NegativeDetail.java
@@ -1,6 +1,8 @@
 package com.biutag.supervision.pojo.domain;
 
+import com.biutag.supervision.pojo.dto.complaintCollection.ComplaintCollectionPageDTO;
 import com.biutag.supervision.pojo.entity.*;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -46,4 +48,8 @@ public class NegativeDetail {
     // 认定办结
     private Boolean confirmationCompletionFlag = false;
 
+
+    @Schema(description = "投诉举报PageDTO")
+    private ComplaintCollectionPageDTO complaintCollectionPageDTO;
+
 }
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java
index 5c0843f..837a4d9 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java
@@ -1,5 +1,6 @@
 package com.biutag.supervision.pojo.dto.complaintCollection;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionSourceTableEnum;
 import com.biutag.supervision.pojo.enums.complaintCollection.YesOrNoEnum;
 import com.biutag.supervision.pojo.vo.FileVo;
@@ -269,5 +270,21 @@ public class ComplaintCollectionPageDTO {
     @Schema(description = "剩余办理时长")
     private Long remainingDuration;
 
+    @Schema(description = "初核工作开展情况")
+    @TableField("init_work_des")
+    private String initWorkDes;
+
+    @Schema(description = "初核发现的问题及下步工作计划")
+    @TableField("init_problem_plan")
+    private String initProblemPlan;
+
+    /**
+     * 和核查结论保持一致
+     * @see  com.biutag.supervision.constants.enums.CheckStatusEnum
+     */
+    @Schema(description = "初核结论")
+    @TableField("init_verdict")
+    private String initVerdict;
+
 
 }
diff --git a/src/main/java/com/biutag/supervision/service/NegativeService.java b/src/main/java/com/biutag/supervision/service/NegativeService.java
index 99728f4..e3305a9 100644
--- a/src/main/java/com/biutag/supervision/service/NegativeService.java
+++ b/src/main/java/com/biutag/supervision/service/NegativeService.java
@@ -24,12 +24,15 @@ import com.biutag.supervision.pojo.domain.NegativeDetail;
 import com.biutag.supervision.pojo.domain.NegativeVo;
 import com.biutag.supervision.pojo.dto.ActionDto;
 import com.biutag.supervision.pojo.dto.NegativeDto;
+import com.biutag.supervision.pojo.dto.complaintCollection.ComplaintCollectionPageDTO;
 import com.biutag.supervision.pojo.dto.flow.FirstDistributeData;
 import com.biutag.supervision.pojo.dto.flow.VerifyData;
 import com.biutag.supervision.pojo.dto.jwdc.NegativeApiDto;
 import com.biutag.supervision.pojo.entity.*;
 import com.biutag.supervision.pojo.model.UserAuth;
+import com.biutag.supervision.pojo.request.complaintCollection.ComplaintCollectionPageRequest;
 import com.biutag.supervision.pojo.vo.NegativeFileVo;
+import com.biutag.supervision.service.complaintCollection.ComplaintCollectionService;
 import com.biutag.supervision.util.SpringUtil;
 import com.biutag.supervision.util.TimeUtil;
 import lombok.RequiredArgsConstructor;
@@ -173,6 +176,8 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
         // 单位会签
         detail.setCountersignApplys(countersignApplyService.list(id));
         enrichCountersignsWithHistory(detail);
+        // 初核情况
+        initDes(detail);
         return detail;
     }
 
@@ -527,4 +532,13 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
 
     }
 
+    private void initDes(NegativeDetail detail) {
+        NegativeVo negative = detail.getNegative();
+        ComplaintCollectionPageRequest complaintCollectionPageRequest = new ComplaintCollectionPageRequest();
+        complaintCollectionPageRequest.setOriginId(negative.getOriginId());
+        // 使用 SpringUtil 延迟获取，打破循环依赖
+        ComplaintCollectionService service = SpringUtil.getBean(ComplaintCollectionService.class);
+        ComplaintCollectionPageDTO complaintCollectionPageDTO = service.getComplaintCollectionPageNew(complaintCollectionPageRequest).getRecords().get(0);
+        detail.setComplaintCollectionPageDTO(complaintCollectionPageDTO);
+    }
 }