Bladeren bron

fix conflict

lixing 4 jaren geleden
bovenliggende
commit
7e07dd79b7

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

@@ -1,7 +1,6 @@
 package com.persagy.apm.energy.report.monthly.outline.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.persagy.apm.common.model.vo.EnumVO;
 import com.persagy.apm.common.response.ApmResponseUpsertVO;
 import com.persagy.apm.common.response.CommonResult;
 import com.persagy.apm.common.response.PageList;
@@ -12,13 +11,12 @@ import com.persagy.apm.energy.report.monthly.outline.model.ConvertReportOutlineT
 import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
 import com.persagy.apm.energy.report.monthly.outline.model.dto.AddReportOutlineDTO;
 import com.persagy.apm.energy.report.monthly.outline.model.dto.PageQueryReportOutlineDTO;
-import com.persagy.apm.energy.report.monthly.outline.model.dto.QueryReportOutlineDTO;
 import com.persagy.apm.energy.report.monthly.outline.model.vo.ResponseReportOutlineListItemVO;
+import com.persagy.apm.energy.report.monthly.outline.model.vo.ResponseReportTypeVO;
 import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineService;
 import com.persagy.apm.energy.report.saasweb.model.vo.PartitionVO;
 import com.persagy.apm.energy.report.saasweb.model.vo.SimpleProjectVO;
 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;
@@ -29,7 +27,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 报告概要控制层

+ 1 - 1
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/vo/ResponseReportOutlineListItemVO.java

@@ -26,7 +26,7 @@ public class ResponseReportOutlineListItemVO {
     @ApiModelProperty("报告月份")
     private Date reportMonth;
 
-    @ApiModelProperty("报告所属")
+    @ApiModelProperty("报告所属类型")
     private String belong;
 
     @ApiModelProperty("报告类型对象")

+ 27 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/vo/ResponseReportTypeVO.java

@@ -0,0 +1,27 @@
+package com.persagy.apm.energy.report.monthly.outline.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author lixing
+ * @version V1.0 2021-05-17 11:09:38
+ */
+@Data
+@ApiModel(value = "报告类型对象")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ResponseReportTypeVO {
+    @ApiModelProperty("报告类型id")
+    private String id;
+
+    @ApiModelProperty("报告类型名称")
+    private String name;
+
+    @ApiModelProperty("报告所属")
+    private Integer belong;
+
+}