技术监督测试管理新增报告上传、审核报告查看

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 有问题
      */

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 有问题
      */

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;
 }

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 有问题
      */

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()));

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());
         //设置状态