Browse Source

增加接口对应数据

wangchenghong 4 years ago
parent
commit
d8764f9d1c
15 changed files with 253 additions and 81 deletions
  1. 44 1
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/CompareCost.java
  2. 44 1
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ComparePower.java
  3. 17 1
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/Job.java
  4. 44 1
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/OpenCost.java
  5. 44 1
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/OpenPower.java
  6. 11 1
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/Platform.java
  7. 7 6
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ReportBusinessDetail.java
  8. 8 6
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/AddReportBusinessDetailDTO.java
  9. 8 6
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/UpdateReportBusinessDetailDTO.java
  10. 8 6
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/vo/ResponseReportBusinessDetailItemVO.java
  11. 1 0
      src/main/java/com/persagy/apm/energy/report/monthly/outline/controller/ReportOutlineController.java
  12. 2 16
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/AddReportOutlineDTO.java
  13. 9 15
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/PageQueryReportOutlineDTO.java
  14. 2 1
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/UpdateReportOutlineDTO.java
  15. 4 19
      src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/ReportOutlineServiceImpl.java

+ 44 - 1
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/CompareCost.java

@@ -1,6 +1,7 @@
 package com.persagy.apm.energy.report.monthly.detail.business.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,5 +11,47 @@ import lombok.Data;
 @Data
 @ApiModel(value = "可同比项目能源费")
 public class CompareCost {
-    // TODO: 2021/5/17 添加参数
+
+    @ApiModelProperty("当前能耗类型编码")
+    private String code;
+
+    @ApiModelProperty("当前能耗类型名称")
+    private String name;
+
+    @ApiModelProperty("父级能耗类型编码")
+    private String parentCode;
+
+    @ApiModelProperty("父级能耗类型名称")
+    private String parentName;
+
+    @ApiModelProperty("本月费用")
+    private Double currentMonth;
+
+    @ApiModelProperty("上月费用")
+    private Double lastMonth;
+
+    @ApiModelProperty("本年度累计费用")
+    private Double yearCount;
+
+    @ApiModelProperty("去年同期累计费用")
+    private Double lastYearCount;
+
+    @ApiModelProperty("环比增量")
+    private Double linkCount;
+
+    @ApiModelProperty("环比增幅")
+    private Double linkRange;
+
+    @ApiModelProperty("同比增量")
+    private Double sameCount;
+
+    @ApiModelProperty("同比增幅")
+    private Double sameRange;
+
+    @ApiModelProperty("本年单方能源费")
+    private Double yearPerCount;
+
+    @ApiModelProperty("去年单方能源费")
+    private Double lastYearPerCount;
+
 }

+ 44 - 1
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ComparePower.java

@@ -1,6 +1,7 @@
 package com.persagy.apm.energy.report.monthly.detail.business.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,5 +11,47 @@ import lombok.Data;
 @Data
 @ApiModel(value = "可同比项目用电量")
 public class ComparePower {
-    // TODO: 2021/5/17 添加参数
+
+    @ApiModelProperty("当前能耗类型编码")
+    private String code;
+
+    @ApiModelProperty("当前能耗类型名称")
+    private String name;
+
+    @ApiModelProperty("父级能耗类型编码")
+    private String parentCode;
+
+    @ApiModelProperty("父级能耗类型名称")
+    private String parentName;
+
+    @ApiModelProperty("本月用电量")
+    private Double currentMonth;
+
+    @ApiModelProperty("上月用电量")
+    private Double lastMonth;
+
+    @ApiModelProperty("本年度累计用电量")
+    private Double yearCount;
+
+    @ApiModelProperty("去年同期累计用电量")
+    private Double lastYearCount;
+
+    @ApiModelProperty("环比增量")
+    private Double linkCount;
+
+    @ApiModelProperty("环比增幅")
+    private Double linkRange;
+
+    @ApiModelProperty("同比增量")
+    private Double sameCount;
+
+    @ApiModelProperty("同比增幅")
+    private Double sameRange;
+
+    @ApiModelProperty("本年单方用电量")
+    private Double yearPerCount;
+
+    @ApiModelProperty("去年单方用电量")
+    private Double lastYearPerCount;
+
 }

+ 17 - 1
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/Job.java

@@ -1,6 +1,7 @@
 package com.persagy.apm.energy.report.monthly.detail.business.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,5 +11,20 @@ import lombok.Data;
 @Data
 @ApiModel(value = "能耗管理工作")
 public class Job {
-    // TODO: 2021/5/17 添加参数
+
+    @ApiModelProperty("本年度能源管理重点工作事项")
+    private String item;
+
+    @ApiModelProperty("起始日期")
+    private String startDate;
+
+    @ApiModelProperty("完成日期")
+    private String endDate;
+
+    @ApiModelProperty("总体进展")
+    private String totalProgress;
+
+    @ApiModelProperty("上个月进展")
+    private String lastMonthProgress;
+
 }

+ 44 - 1
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/OpenCost.java

@@ -1,6 +1,7 @@
 package com.persagy.apm.energy.report.monthly.detail.business.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,5 +11,47 @@ import lombok.Data;
 @Data
 @ApiModel(value = "在营项目能源费")
 public class OpenCost {
-    // TODO: 2021/5/17 添加参数
+
+    @ApiModelProperty("当前能耗类型编码")
+    private String code;
+
+    @ApiModelProperty("当前能耗类型名称")
+    private String name;
+
+    @ApiModelProperty("父级能耗类型编码")
+    private String parentCode;
+
+    @ApiModelProperty("父级能耗类型名称")
+    private String parentName;
+
+    @ApiModelProperty("本月费用")
+    private Double currentMonth;
+
+    @ApiModelProperty("上月费用")
+    private Double lastMonth;
+
+    @ApiModelProperty("本年度累计费用")
+    private Double yearCount;
+
+    @ApiModelProperty("去年同期累计费用")
+    private Double lastYearCount;
+
+    @ApiModelProperty("环比增量")
+    private Double linkCount;
+
+    @ApiModelProperty("环比增幅")
+    private Double linkRange;
+
+    @ApiModelProperty("同比增量")
+    private Double sameCount;
+
+    @ApiModelProperty("同比增幅")
+    private Double sameRange;
+
+    @ApiModelProperty("本年单方能源费")
+    private Double yearPerCount;
+
+    @ApiModelProperty("去年单方能源费")
+    private Double lastYearPerCount;
+
 }

+ 44 - 1
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/OpenPower.java

@@ -1,6 +1,7 @@
 package com.persagy.apm.energy.report.monthly.detail.business.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,5 +11,47 @@ import lombok.Data;
 @Data
 @ApiModel(value = "在营项目用电量")
 public class OpenPower {
-    // TODO: 2021/5/17 添加参数
+
+    @ApiModelProperty("当前能耗类型编码")
+    private String code;
+
+    @ApiModelProperty("当前能耗类型名称")
+    private String name;
+
+    @ApiModelProperty("父级能耗类型编码")
+    private String parentCode;
+
+    @ApiModelProperty("父级能耗类型名称")
+    private String parentName;
+
+    @ApiModelProperty("本月用电量")
+    private Double currentMonth;
+
+    @ApiModelProperty("上月用电量")
+    private Double lastMonth;
+
+    @ApiModelProperty("本年度累计用电量")
+    private Double yearCount;
+
+    @ApiModelProperty("去年同期累计用电量")
+    private Double lastYearCount;
+
+    @ApiModelProperty("环比增量")
+    private Double linkCount;
+
+    @ApiModelProperty("环比增幅")
+    private Double linkRange;
+
+    @ApiModelProperty("同比增量")
+    private Double sameCount;
+
+    @ApiModelProperty("同比增幅")
+    private Double sameRange;
+
+    @ApiModelProperty("本年单方用电量")
+    private Double yearPerCount;
+
+    @ApiModelProperty("去年单方用电量")
+    private Double lastYearPerCount;
+
 }

+ 11 - 1
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/Platform.java

@@ -1,6 +1,7 @@
 package com.persagy.apm.energy.report.monthly.detail.business.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,5 +11,14 @@ import lombok.Data;
 @Data
 @ApiModel(value = "能耗管理平台运维")
 public class Platform {
-    // TODO: 2021/5/17 添加参数
+
+    @ApiModelProperty("编码")
+    private String code;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("数据")
+    private String data;
+
 }

+ 7 - 6
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ReportBusinessDetail.java

@@ -11,6 +11,7 @@ import com.persagy.apm.common.model.entity.AuditableEntity;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 报告详情(ReportBusinessDetail)实体类
@@ -27,42 +28,42 @@ public class ReportBusinessDetail extends AuditableEntity<ReportBusinessDetail>
 
     @ApiModelProperty("在营项目用电量数据对象信息,项目月报使用此字段")
     @TableField(typeHandler = FastjsonTypeHandler.class)
-    private OpenPower openPower;
+    private List<OpenPower> openPower;
 
     @ApiModelProperty("在营项目用电情况说明")
     private String openPowerExplain;
 
     @ApiModelProperty("可同比项目用电量数据对象信息")
     @TableField(typeHandler = FastjsonTypeHandler.class)
-    private ComparePower comparePower;
+    private List<ComparePower> comparePower;
 
     @ApiModelProperty("可同比项目用电情况说明")
     private String comparePowerExplain;
 
     @ApiModelProperty("在营项目能源费数据对象信息,项目月报使用此字段")
     @TableField(typeHandler = FastjsonTypeHandler.class)
-    private OpenCost openCost;
+    private List<OpenCost> openCost;
 
     @ApiModelProperty("在营项目费用说明")
     private String openCostExplain;
 
     @ApiModelProperty("可同比项目能源费数据对象信息")
     @TableField(typeHandler = FastjsonTypeHandler.class)
-    private CompareCost compareCost;
+    private List<CompareCost> compareCost;
 
     @ApiModelProperty("可同比项目费用说明")
     private String compareCostExplain;
 
     @ApiModelProperty("能耗管理工作开展对象信息")
     @TableField(typeHandler = FastjsonTypeHandler.class)
-    private Job job;
+    private List<Job> job;
 
     @ApiModelProperty("备注说明")
     private String remark;
 
     @ApiModelProperty("能耗管理平台运维对象信息")
     @TableField(typeHandler = FastjsonTypeHandler.class)
-    private Platform platform;
+    private List<Platform> platform;
 
     @ApiModelProperty("事项说明")
     private String itemExplain;

+ 8 - 6
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/AddReportBusinessDetailDTO.java

@@ -1,5 +1,6 @@
 package com.persagy.apm.energy.report.monthly.detail.business.model.dto;
 
+import com.persagy.apm.energy.report.monthly.detail.business.model.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -8,6 +9,7 @@ import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author lixing
@@ -18,7 +20,7 @@ import java.util.Date;
 public class AddReportBusinessDetailDTO {
     @ApiModelProperty(value = "在营项目用电量数据对象信息,项目月报使用此字段", required = true)
     @NotNull(message = "在营项目用电量数据对象信息,项目月报使用此字段不能为空") // todo 更新校验规则
-    private Object openPower;
+    private List<OpenPower> openPower;
 
     @ApiModelProperty(value = "在营项目用电情况说明", required = true)
     @NotNull(message = "在营项目用电情况说明不能为空") // todo 更新校验规则
@@ -26,7 +28,7 @@ public class AddReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "可同比项目用电量数据对象信息", required = true)
     @NotNull(message = "可同比项目用电量数据对象信息不能为空") // todo 更新校验规则
-    private Object comparePower;
+    private List<ComparePower> comparePower;
 
     @ApiModelProperty(value = "可同比项目用电情况说明", required = true)
     @NotNull(message = "可同比项目用电情况说明不能为空") // todo 更新校验规则
@@ -34,7 +36,7 @@ public class AddReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "在营项目能源费数据对象信息,项目月报使用此字段", required = true)
     @NotNull(message = "在营项目能源费数据对象信息,项目月报使用此字段不能为空") // todo 更新校验规则
-    private Object openCost;
+    private List<OpenCost> openCost;
 
     @ApiModelProperty(value = "在营项目费用说明", required = true)
     @NotNull(message = "在营项目费用说明不能为空") // todo 更新校验规则
@@ -42,7 +44,7 @@ public class AddReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "可同比项目能源费数据对象信息", required = true)
     @NotNull(message = "可同比项目能源费数据对象信息不能为空") // todo 更新校验规则
-    private Object compareCost;
+    private List<CompareCost> compareCost;
 
     @ApiModelProperty(value = "可同比项目费用说明", required = true)
     @NotNull(message = "可同比项目费用说明不能为空") // todo 更新校验规则
@@ -50,7 +52,7 @@ public class AddReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "能耗管理工作开展对象信息", required = true)
     @NotNull(message = "能耗管理工作开展对象信息不能为空") // todo 更新校验规则
-    private Object job;
+    private List<Job> job;
 
     @ApiModelProperty(value = "备注说明", required = true)
     @NotNull(message = "备注说明不能为空") // todo 更新校验规则
@@ -58,7 +60,7 @@ public class AddReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "能耗管理平台运维对象信息", required = true)
     @NotNull(message = "能耗管理平台运维对象信息不能为空") // todo 更新校验规则
-    private Object platform;
+    private List<Platform> platform;
 
     @ApiModelProperty(value = "事项说明", required = true)
     @NotNull(message = "事项说明不能为空") // todo 更新校验规则

+ 8 - 6
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/UpdateReportBusinessDetailDTO.java

@@ -1,5 +1,6 @@
 package com.persagy.apm.energy.report.monthly.detail.business.model.dto;
 
+import com.persagy.apm.energy.report.monthly.detail.business.model.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -8,6 +9,7 @@ import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author lixing
@@ -22,7 +24,7 @@ public class UpdateReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "在营项目用电量数据对象信息,项目月报使用此字段", required = true)
     @NotNull(message = "在营项目用电量数据对象信息,项目月报使用此字段不能为空") // todo 更新校验规则
-    private Object openPower;
+    private List<OpenPower> openPower;
 
     @ApiModelProperty(value = "在营项目用电情况说明", required = true)
     @NotNull(message = "在营项目用电情况说明不能为空") // todo 更新校验规则
@@ -30,7 +32,7 @@ public class UpdateReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "可同比项目用电量数据对象信息", required = true)
     @NotNull(message = "可同比项目用电量数据对象信息不能为空") // todo 更新校验规则
-    private Object comparePower;
+    private List<ComparePower> comparePower;
 
     @ApiModelProperty(value = "可同比项目用电情况说明", required = true)
     @NotNull(message = "可同比项目用电情况说明不能为空") // todo 更新校验规则
@@ -38,7 +40,7 @@ public class UpdateReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "在营项目能源费数据对象信息,项目月报使用此字段", required = true)
     @NotNull(message = "在营项目能源费数据对象信息,项目月报使用此字段不能为空") // todo 更新校验规则
-    private Object openCost;
+    private List<OpenCost> openCost;
 
     @ApiModelProperty(value = "在营项目费用说明", required = true)
     @NotNull(message = "在营项目费用说明不能为空") // todo 更新校验规则
@@ -46,7 +48,7 @@ public class UpdateReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "可同比项目能源费数据对象信息", required = true)
     @NotNull(message = "可同比项目能源费数据对象信息不能为空") // todo 更新校验规则
-    private Object compareCost;
+    private List<CompareCost> compareCost;
 
     @ApiModelProperty(value = "可同比项目费用说明", required = true)
     @NotNull(message = "可同比项目费用说明不能为空") // todo 更新校验规则
@@ -54,7 +56,7 @@ public class UpdateReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "能耗管理工作开展对象信息", required = true)
     @NotNull(message = "能耗管理工作开展对象信息不能为空") // todo 更新校验规则
-    private Object job;
+    private List<Job> job;
 
     @ApiModelProperty(value = "备注说明", required = true)
     @NotNull(message = "备注说明不能为空") // todo 更新校验规则
@@ -62,7 +64,7 @@ public class UpdateReportBusinessDetailDTO {
 
     @ApiModelProperty(value = "能耗管理平台运维对象信息", required = true)
     @NotNull(message = "能耗管理平台运维对象信息不能为空") // todo 更新校验规则
-    private Object platform;
+    private List<Platform> platform;
 
     @ApiModelProperty(value = "事项说明", required = true)
     @NotNull(message = "事项说明不能为空") // todo 更新校验规则

+ 8 - 6
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/vo/ResponseReportBusinessDetailItemVO.java

@@ -1,10 +1,12 @@
 package com.persagy.apm.energy.report.monthly.detail.business.model.vo;
 
+import com.persagy.apm.energy.report.monthly.detail.business.model.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
@@ -20,37 +22,37 @@ public class ResponseReportBusinessDetailItemVO {
     private String id;
 
     @ApiModelProperty("在营项目用电量数据对象信息,项目月报使用此字段")
-    private Object openPower;
+    private List<OpenPower> openPower;
 
     @ApiModelProperty("在营项目用电情况说明")
     private String openPowerExplain;
 
     @ApiModelProperty("可同比项目用电量数据对象信息")
-    private Object comparePower;
+    private List<ComparePower> comparePower;
 
     @ApiModelProperty("可同比项目用电情况说明")
     private String comparePowerExplain;
 
     @ApiModelProperty("在营项目能源费数据对象信息,项目月报使用此字段")
-    private Object openCost;
+    private List<OpenCost> openCost;
 
     @ApiModelProperty("在营项目费用说明")
     private String openCostExplain;
 
     @ApiModelProperty("可同比项目能源费数据对象信息")
-    private Object compareCost;
+    private List<CompareCost> compareCost;
 
     @ApiModelProperty("可同比项目费用说明")
     private String compareCostExplain;
 
     @ApiModelProperty("能耗管理工作开展对象信息")
-    private Object job;
+    private List<Job> job;
 
     @ApiModelProperty("备注说明")
     private String remark;
 
     @ApiModelProperty("能耗管理平台运维对象信息")
-    private Object platform;
+    private List<Platform> platform;
 
     @ApiModelProperty("事项说明")
     private String itemExplain;

+ 1 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/controller/ReportOutlineController.java

@@ -13,6 +13,7 @@ import com.persagy.apm.energy.report.monthly.outline.model.dto.QueryReportOutlin
 import com.persagy.apm.energy.report.monthly.outline.model.vo.ResponseReportOutlineListItemVO;
 import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;

+ 2 - 16
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/AddReportOutlineDTO.java

@@ -17,9 +17,6 @@ import java.util.Date;
 @Data
 @ApiModel(value = "创建报告概要入参")
 public class AddReportOutlineDTO {
-    @ApiModelProperty(value = "报告名称", required = true)
-    @NotNull(message = "报告名称不能为空") // todo 更新校验规则
-    private String name;
 
     @ApiModelProperty(value = "报告日期", required = true)
     @NotNull(message = "报告日期不能为空") // todo 更新校验规则
@@ -29,19 +26,8 @@ public class AddReportOutlineDTO {
     @NotNull(message = "报告所属不能为空") // todo 更新校验规则
     private String belong;
 
-    @ApiModelProperty(value = "报告类型", required = true)
-    @NotNull(message = "报告类型不能为空") // todo 更新校验规则
+    @ApiModelProperty(value = "报告类型id", required = true)
+    @NotNull(message = "报告类型id不能为空") // todo 更新校验规则
     private String type;
 
-    @ApiModelProperty(value = "报告详情id", required = true)
-    @NotNull(message = "报告详情id不能为空") // todo 更新校验规则
-    private String detailId;
-
-    @ApiModelProperty(value = "报告状态", required = true)
-    @NotNull(message = "报告状态不能为空") // todo 更新校验规则
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private ReportOutlineRemark remark;
-
 }

+ 9 - 15
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/PageQueryReportOutlineDTO.java

@@ -9,6 +9,8 @@ import com.persagy.apm.common.model.dto.PageDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author lixing
  * @version V1.0 2021-05-17 11:09:38
@@ -17,28 +19,20 @@ import lombok.EqualsAndHashCode;
 @Data
 @ApiModel(value = "分页查询报告概要入参")
 public class PageQueryReportOutlineDTO extends PageDTO {
-    @ApiModelProperty(value = "报告id", required = true)
-    private String id;
 
     @ApiModelProperty(value = "报告名称", required = true)
     private String name;
 
-    @ApiModelProperty(value = "报告日期", required = true)
-    private Date date;
-
-    @ApiModelProperty(value = "报告所属", required = true)
-    private String belong;
+    @ApiModelProperty(value = "报告开始日期", required = true)
+    @NotNull(message = "报告开始日期不能为空")
+    private Date startDate;
 
-    @ApiModelProperty(value = "报告类型", required = true)
-    private String type;
-
-    @ApiModelProperty(value = "报告详情id", required = true)
-    private String detailId;
+    @ApiModelProperty(value = "报告结束日期", required = true)
+    @NotNull(message = "报告结束日期不能为空")
+    private Date endDate;
 
     @ApiModelProperty(value = "报告状态", required = true)
+    @NotNull(message = "报告状态不能为空")
     private Integer status;
 
-    @ApiModelProperty(value = "备注", required = true)
-    private Object remark;
-
 }

+ 2 - 1
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/UpdateReportOutlineDTO.java

@@ -1,5 +1,6 @@
 package com.persagy.apm.energy.report.monthly.outline.model.dto;
 
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutlineRemark;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -46,6 +47,6 @@ public class UpdateReportOutlineDTO {
 
     @ApiModelProperty(value = "备注", required = true)
     @NotNull(message = "备注不能为空") // todo 更新校验规则
-    private Object remark;
+    private ReportOutlineRemark remark;
 
 }

+ 4 - 19
src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/ReportOutlineServiceImpl.java

@@ -211,33 +211,18 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
             queryWrapper.like(ReportOutline.PROP_NAME, pageQueryReportOutlineDTO.getName());
         }
 
-        if (pageQueryReportOutlineDTO.getDate() != null) {
-            queryWrapper.eq(ReportOutline.PROP_DATE, pageQueryReportOutlineDTO.getDate());
+        if (pageQueryReportOutlineDTO.getStartDate() != null) {
+            queryWrapper.gt(ReportOutline.PROP_DATE, pageQueryReportOutlineDTO.getStartDate());
         }
 
-        // todo 需判断使用like还是eq
-        if (StringUtils.isNotEmpty(pageQueryReportOutlineDTO.getBelong())) {
-            queryWrapper.like(ReportOutline.PROP_BELONG, pageQueryReportOutlineDTO.getBelong());
-        }
-
-        // todo 需判断使用like还是eq
-        if (StringUtils.isNotEmpty(pageQueryReportOutlineDTO.getType())) {
-            queryWrapper.like(ReportOutline.PROP_TYPE, pageQueryReportOutlineDTO.getType());
-        }
-
-        // todo 需判断使用like还是eq
-        if (StringUtils.isNotEmpty(pageQueryReportOutlineDTO.getDetailId())) {
-            queryWrapper.like(ReportOutline.PROP_DETAIL_ID, pageQueryReportOutlineDTO.getDetailId());
+        if (pageQueryReportOutlineDTO.getEndDate() != null) {
+            queryWrapper.lt(ReportOutline.PROP_DATE, pageQueryReportOutlineDTO.getEndDate());
         }
 
         if (pageQueryReportOutlineDTO.getStatus() != null) {
             queryWrapper.eq(ReportOutline.PROP_STATUS, pageQueryReportOutlineDTO.getStatus());
         }
 
-        if (pageQueryReportOutlineDTO.getRemark() != null) {
-            queryWrapper.eq(ReportOutline.PROP_REMARK, pageQueryReportOutlineDTO.getRemark());
-        }
-
         return getBaseMapper().selectPage(pageParam, queryWrapper);
     }
 }