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