From c343e5765ca859f7e2e273b85ec7dd4ebc446c66 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Mon, 4 Nov 2024 09:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=80=E5=8C=97=E7=94=B5=E8=83=BD=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E9=97=AE=E9=A2=98=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/leaflet/mapping/WarningLeafletMapper.xml      | 9 ++++++---
 .../service/survey/impl/SurveyTestServiceImpl.java       | 7 +++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/leaflet/mapping/WarningLeafletMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/leaflet/mapping/WarningLeafletMapper.xml
index 1cd657baa..6a523f09c 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/leaflet/mapping/WarningLeafletMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/leaflet/mapping/WarningLeafletMapper.xml
@@ -24,7 +24,8 @@
                supervision_warning_leaflet.create_time,
                supervision_warning_leaflet.update_by,
                supervision_warning_leaflet.update_time,
-               supervision_warning_leaflet.file_path
+               supervision_warning_leaflet.file_path,
+                supervision_warning_leaflet.deal_state
         FROM supervision_warning_leaflet supervision_warning_leaflet
         WHERE ${ew.sqlSegment}
     </select>
@@ -50,7 +51,8 @@
                supervision_warning_leaflet.create_time,
                supervision_warning_leaflet.update_by,
                supervision_warning_leaflet.update_time,
-               supervision_warning_leaflet.file_path
+               supervision_warning_leaflet.file_path,
+        supervision_warning_leaflet.deal_state
         FROM supervision_warning_leaflet supervision_warning_leaflet
         WHERE ${ew.sqlSegment}
     </select>
@@ -76,7 +78,8 @@
             supervision_warning_leaflet.create_time,
             supervision_warning_leaflet.update_by,
             supervision_warning_leaflet.update_time,
-            supervision_warning_leaflet.file_path
+            supervision_warning_leaflet.file_path,
+        supervision_warning_leaflet.deal_state
         FROM supervision_warning_leaflet supervision_warning_leaflet
         WHERE ${ew.sqlSegment}
     </select>
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
index e160a7215..0bcafae3c 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
@@ -29,6 +29,7 @@ import com.njcn.supervision.enums.*;
 import com.njcn.supervision.mapper.survey.SurveyTestMapper;
 import com.njcn.supervision.pojo.param.leaflet.WarningAddParam;
 import com.njcn.supervision.pojo.param.survey.SurveyTestParam;
+import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet;
 import com.njcn.supervision.pojo.po.survey.SurveyPlan;
 import com.njcn.supervision.pojo.po.survey.SurveyTest;
 import com.njcn.supervision.pojo.vo.survey.SurveyTestVO;
@@ -361,6 +362,12 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
         surveyTestVO.setPlanName(surveyPlan.getPlanName());
         surveyTestVO.setSupvType(surveyPlan.getSupvType());
         surveyTestVO.setSupvObjectName(surveyPlan.getSupvObjectName());
+        WarningLeaflet one = warningLeafletService.lambdaQuery().eq(WarningLeaflet::getProblemId, id).one();
+        if(Objects.nonNull(one)){
+            surveyTestVO.setReformAdvice(one.getReformAdvice());
+            surveyTestVO.setTakeStep(one.getTakeStep());
+            surveyTestVO.setReportPath(one.getReportPath());
+        }
         //负责单位
         surveyTestVO.setDeptName(deptFeignClient.getDeptById(surveyTestVO.getDeptId()).getData().getName());
         //变电站名称