From e6a1874abfedde276f013f2c84217c1ee99e51e0 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 2 Jul 2024 19:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E3=80=81=E5=AE=A1=E6=A0=B8=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/supervision/pojo/param/survey/SurveyTestParam.java | 6 ++++++
 .../com/njcn/supervision/pojo/po/survey/SurveyTest.java     | 5 +++++
 .../njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java  | 3 +++
 .../com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java   | 5 +++++
 .../service/leaflet/impl/WarningLeafletServiceImpl.java     | 1 +
 .../service/survey/impl/SurveyTestServiceImpl.java          | 1 +
 6 files changed, 21 insertions(+)

diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java
index 0fd61b0c9..7b0db87b8 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java
@@ -58,6 +58,12 @@ public class SurveyTestParam implements Serializable {
     @ApiModelProperty(value = "测试报告")
     private String testReport;
 
+    /**
+     * 技术监督报告
+     */
+    @ApiModelProperty(value = "技术监督报告")
+    private String supervisionReport;
+
     /**
      * 是否有问题 0 没有问题 1 有问题
      */
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java
index 45ccfcb4b..b4c84ea45 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java
@@ -67,6 +67,11 @@ public class SurveyTest extends BaseEntity implements Serializable {
      */
     private String testReport;
 
+    /**
+     * 技术监督报告
+     */
+    private String supervisionReport;
+
     /**
      * 是否有问题 0 没有问题 1 有问题
      */
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java
index a4a8294c2..299ecbc61 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java
@@ -120,4 +120,7 @@ public class WarningLeafletVO extends BaseEntity implements Serializable{
 
     @ApiModelProperty("预告警单下载路径")
     private String filePath;
+
+    @ApiModelProperty("技术监督报告")
+    private String supervisionReport;
 }
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java
index f44188551..d66600fef 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java
@@ -93,6 +93,11 @@ public class SurveyTestVO extends BaseEntity implements Serializable {
      */
     private String testReport;
 
+    /**
+     * 技术监督报告
+     */
+    private String supervisionReport;
+
     /**
      * 是否有问题 0 没有问题 1 有问题
      */
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
index f801d89cb..2c27530ec 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
@@ -291,6 +291,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
                     //查询到现场测试超标附件地址
                     SurveyTest surveyTest = surveyTestService.getById(record.getProblemId());
                     record.setProblemPath(surveyTest.getTestReport());
+                    record.setSupervisionReport(surveyTest.getSupervisionReport());
                 }
                 if (deptMap.containsKey(record.getDutyOrgId())) {
                     record.setDutyOrgName(deptMap.get(record.getDutyOrgId()));
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 403105862..2980e8012 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
@@ -205,6 +205,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
         surveyTest.setCompleteTime(surveyTestParam.getCompleteTime());
         surveyTest.setCompleteBy(surveyTestParam.getCompleteBy());
         surveyTest.setTestReport(surveyTestParam.getTestReport());
+        surveyTest.setSupervisionReport(surveyTestParam.getSupervisionReport());
         surveyTest.setProblemFlag(surveyTestParam.getProblemFlag());
         surveyTest.setProblemDetail(surveyTestParam.getProblemDetail());
         //设置状态