敏感用户污染值统计

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/PowerFlagPollution.java

@@ -9,6 +9,12 @@ import java.io.Serializable;
 @Data
 public class PowerFlagPollution implements Serializable {
 
+    /**
+     * 变电站名称
+     */
+    @Excel(name = "变电站名称", width = 35, replace = "/_null")
+    @ApiModelProperty("变电站名称")
+    private String subName;
 
     /**
      * 监测点名称

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/SubstationPollution.java

@@ -38,6 +38,10 @@ public class SubstationPollution implements Serializable {
     @ApiModelProperty("电站谐波污染值")
     private String subVStationValue;
 
+    @Excel(name = "项目名称", width = 25, needMerge = true)
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
 
     /**
      * 电网侧&非电网侧

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/StatSubstationBizBaseParam.java

@@ -36,4 +36,10 @@ public class StatSubstationBizBaseParam extends StatisticsBizBaseParam {
     @ApiModelProperty("电网侧标识")
     @Range(min = 0, max = 2, message = "电网侧标识" + ValidMessage.PARAM_FORMAT_ERROR)
     private Integer powerFlag;
+
+    @ApiModelProperty("部门id")
+    private String deptId;
+
+    @ApiModelProperty("搜索值")
+    private String searchValue;
 }