From ca51c96e9fe8753dc0aafe78975230e39a0ab4f0 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 6 Jun 2024 21:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/survey/SurveyPlanParam.java | 12 ++++++++++++ .../njcn/supervision/pojo/po/survey/SurveyPlan.java | 10 ++++++++++ .../supervision/pojo/vo/survey/SurveyPlanVO.java | 13 +++++++++++++ .../supervision/pojo/vo/survey/SurveyTestVO.java | 13 +++++++++++++ .../mapper/survey/mapping/SurveyTestMapper.xml | 2 ++ .../impl/SupervisionUserComplaintPOServiceImpl.java | 2 +- .../service/survey/impl/SurveyTestServiceImpl.java | 4 +++- 7 files changed, 54 insertions(+), 2 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java index d44924814..76cda7809 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java @@ -69,6 +69,18 @@ public class SurveyPlanParam implements Serializable { @ApiModelProperty(value = "历史流程实例id列表") private String historyInstanceId; + /** + * 监督类型 + */ + @ApiModelProperty(value = "监督类型") + private String supvType; + + /** + * 监督对象名称 + */ + @ApiModelProperty(value = "监督对象名称") + private String supvObjectName; + @Data @EqualsAndHashCode(callSuper = true) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyPlan.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyPlan.java index 0fb557bcd..d9147c94d 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyPlan.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyPlan.java @@ -74,6 +74,16 @@ public class SurveyPlan extends BaseEntity implements Serializable { */ private String historyInstanceId; + /** + * 监督类型 + */ + private String supvType; + + /** + * 监督对象名称 + */ + private String supvObjectName; + /** * 状态：0-删除 1-正常 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyPlanVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyPlanVO.java index a375bfa50..c166625d1 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyPlanVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyPlanVO.java @@ -1,6 +1,7 @@ package com.njcn.supervision.pojo.vo.survey; import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -80,6 +81,18 @@ public class SurveyPlanVO extends BaseEntity implements Serializable { */ private String historyInstanceId; + /** + * 监督类型 + */ + @ApiModelProperty(value = "监督类型") + private String supvType; + + /** + * 监督对象名称 + */ + @ApiModelProperty(value = "监督对象名称") + private String supvObjectName; + /** * 状态：0-删除 1-正常 */ 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 0f1015194..f44188551 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 @@ -3,6 +3,7 @@ package com.njcn.supervision.pojo.vo.survey; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -123,6 +124,18 @@ public class SurveyTestVO extends BaseEntity implements Serializable { */ private Integer initiateWarningFlag; + /** + * 监督类型 + */ + @ApiModelProperty(value = "监督类型") + private String supvType; + + /** + * 监督对象名称 + */ + @ApiModelProperty(value = "监督对象名称") + private String supvObjectName; + /** * 状态：0-删除 1-正常 */ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml index 4ede081de..a3f5e7617 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml @@ -8,6 +8,8 @@ supervision_survey_plan.custom_substation_flag customSubstationFlag, supervision_survey_plan.substation substation, supervision_survey_plan.plan_start_time planStartTime, + supervision_survey_plan.supv_type supvType, + supervision_survey_plan.supv_object_name supvObjectName, supervision_survey_plan.plan_end_time planEndTime FROM supervision_survey_test supervision_survey_test left join supervision_survey_plan supervision_survey_plan diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java index 7456e3b02..a3a84d15a 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java @@ -92,7 +92,7 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl