普测测试流程

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java

@@ -23,6 +23,9 @@ public class SurveyTestParam extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("id")
+    @NotBlank(message = "索引不能为空")
+    private String Id;
 
     /**
      * 普测计划表id
@@ -88,10 +91,6 @@ public class SurveyTestParam extends BaseEntity implements Serializable {
     @EqualsAndHashCode(callSuper = true)
     public static class SurveyTestUpdateParam extends SurveyTestParam {
 
-        @ApiModelProperty("id")
-        @NotBlank(message = "索引不能为空")
-        private String Id;
-
 
     }
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java

@@ -30,11 +30,52 @@ public class SurveyTestVO extends BaseEntity implements Serializable {
      */
     private String planId;
 
+    /**
+     * 普测计划名称
+     */
+    private String planName;
+
+    /**
+     * 0 关联系统内变电站；1 用户手动输入变电站
+     */
+    private Integer customSubstationFlag;
+
+    /**
+     * 变电站台账ID或者用户手动输入的变电站名称
+     */
+    private String substation;
+
+    /**
+     * 变电站名称
+     */
+    private String substationName;
+
+    /**
+     * 变电站电压等级
+     */
+    private String voltageLevel;
+
+    /**
+     * 计划开始时间
+     */
+    private LocalDate planStartTime;
+
+    /**
+     * 计划结束时间
+     */
+    private LocalDate planEndTime;
+
     /**
      * 负责单位id
      */
     private String deptId;
 
+    /**
+     * 负责单位名称
+     */
+    private String deptName;
+
+
     /**
      * 计划完成时间
      */