优化时间格式返回

新增修正的修改人,修改时间

hnls-gis/src/main/java/com/tofly/xrtygis/entity/Customize.java

@@ -44,7 +44,7 @@ public class Customize extends Model<Customize> {
      * 修正日期
      */
     @ApiModelProperty(value = "修正日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reviseDate;
     /**
@@ -67,7 +67,7 @@ public class Customize extends Model<Customize> {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "分区级别")
-    private String dmaLevle;
+    private String dmaLevel;
     /**
      * 自定义漏损率修正系数
      */

hnls-gis/src/main/java/com/tofly/xrtygis/entity/IndicatorCorrection.java

@@ -45,7 +45,7 @@ public class IndicatorCorrection extends Model<IndicatorCorrection> {
      * 修正日期
      */
     @ApiModelProperty(value = "修正日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reviseDate;
     /**
@@ -116,7 +116,11 @@ public class IndicatorCorrection extends Model<IndicatorCorrection> {
     @TableField(exist = false)
     @ApiModelProperty(hidden = true)
     private String createUserName;
-
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
+    private Date updateTime;
     @ApiModelProperty(value = "修改人")
     @TableField(value = "UPDATE_USER", fill = FieldFill.UPDATE)
     private Long updateUser;

hnls-gis/src/main/resources/mapper/IndicatorCorrectionMapper.xml

@@ -26,6 +26,8 @@
         <association property="dmaLevel" column="DMA_ID" select="com.tofly.xrtygis.mapper.LeakAssessmentMapper.getDmaLevleName"/>
         <association property="createUserName" column="CREATE_USER"
                      select="com.tofly.baseapi.mapper.ToflyCodeCommonMapper.getUserName"/>
+        <association property="updateUserName" column="UPDATE_USER"
+                     select="com.tofly.baseapi.mapper.ToflyCodeCommonMapper.getUserName"/>
     </resultMap>
 
     <select id="getDmaUserWaterConsumption" resultType="com.tofly.xrtygis.entity.vo.DmaCalculatePramVo">

hnls-mis/hnls-mis-api/src/main/java/com/tofly/pojo/LeakInfo.java

@@ -11,6 +11,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 
 /**
  * 漏点基本信息表
@@ -68,7 +70,8 @@ public class LeakInfo extends Model<LeakInfo> {
      */
     @ApiModelProperty(value = "消除漏点建议")
     private String disposeSuggest;
-
+    @ApiModelProperty(value = "预估漏损水量")
+    private BigDecimal estimatedWaterLoss;
     /**
      * 业务工单id
      */