结算时间段修改

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/measurementsettlement/MeasurementSettlementDto.java

@@ -2,6 +2,7 @@ package com.zcxk.rmcp.api.dto.measurementsettlement;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.zcxk.core.utils.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -90,11 +91,13 @@ public class MeasurementSettlementDto {
      * 截止日期
      */
     @ApiModelProperty(value = "截止日期")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date clearingEndDate;
     /**
      * 开始日期
      */
     @ApiModelProperty(value = "开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date clearingStartDate;
     /**
      * 创建时间
@@ -135,4 +138,15 @@ public class MeasurementSettlementDto {
     @ApiModelProperty(value = "租户id",hidden = true)
     @JsonIgnore
     private String tenantId;
+    @JsonIgnore
+    private String billingPeriodStr;
+    public String getBillingPeriodStr() {
+        if(billingPeriod!=null){
+            billingPeriodStr= DateUtil.format(billingPeriod,"yyyyMM");
+        }
+        return billingPeriodStr;
+    }
+
+
+
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/measurementsettlement/WaterConsumptionUpdateDto.java

@@ -17,4 +17,6 @@ public class WaterConsumptionUpdateDto {
 
     @ApiModelProperty(value="用水量")
     private double waterConsumption;
+    @ApiModelProperty(value="电子号")
+    private String meterNo;
 }