From 87a7c96f5446d5443341cf05deafd521c48dfff3 Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 13 Apr 2023 16:41:58 +0800
Subject: [PATCH] =?UTF-8?q?#=E6=B0=B4=E7=94=B5=E7=AB=99=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/main/vo/AreaMonthReportVo.java     | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AreaMonthReportVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AreaMonthReportVo.java
index 0d7d77b..3d3894e 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AreaMonthReportVo.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AreaMonthReportVo.java
@@ -1,5 +1,7 @@
 package com.hnac.hzims.operational.main.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,65 +12,85 @@ import lombok.Data;
 public class AreaMonthReportVo {
 
 	@ApiModelProperty(value = "区域Id")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long areaId;
 
 	@ApiModelProperty(value = "区域名称")
 	private String areaName;
 
 	@ApiModelProperty(value = "计划发电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Float planPower;
 
 	@ApiModelProperty(value = "实际发电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Float actualPower;
 
 	@ApiModelProperty(value = "发电完成率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double powerFinishRate;
 
 	@ApiModelProperty(value = "同比")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double comparePowerRate;
 
 	@ApiModelProperty(value = "发电计划预测")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double predictPlanPower;
 
 	@ApiModelProperty(value = "操作票")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer operate;
 
 	@ApiModelProperty(value = "操作票合格率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double operaQualifyRate;
 
 	@ApiModelProperty(value = "工作票")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer work;
 
 	@ApiModelProperty(value = "工作票合格率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double workQualifyRate;
 
 	@ApiModelProperty(value = "日常维护")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer routineMaintenance;
 
 	@ApiModelProperty(value = "巡检任务")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer inspect;
 
 	@ApiModelProperty(value = "缺陷数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer defect;
 
 	@ApiModelProperty(value = "消缺率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double defectRate;
 
 	@ApiModelProperty(value = "检修任务数量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer maintenanceTasks;
 
 	@ApiModelProperty(value = "安全生产会议次数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer safetyMeeting;
 
 	@ApiModelProperty(value = "月度自查报告")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer selfReport;
 
 	@ApiModelProperty(value = "设备试验")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer deviceTry;
 
 	@ApiModelProperty(value = "技能培训")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer skillTrainy;
 
 	@ApiModelProperty(value = "安全大检查")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer securityCheck;
 }