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