From 1ecef89fb099815de465ca59b2563e7ae046e2a2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Sep 2021 10:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E9=A1=B9=E7=9B=AE=E5=88=86?=
=?UTF-8?q?=E5=B8=83=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ScreenProjectDistributionFormDTO.java | 1 +
.../ScreenProjectDistributionResultDTO.java | 6 ++++
.../mapper/screen/ScreenProjectDataDao.xml | 32 +++++++++----------
3 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java
index b6eeff0053..d189574ef3 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java
@@ -21,6 +21,7 @@ public class ScreenProjectDistributionFormDTO implements Serializable {
/**
* 如果为空返回全部；可选值：1:红色事件；2：黄色事件；3：绿色事件
+ * all:全部
*/
@NotBlank(message = "level不能为空")
private String level;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
index ec2c9e5219..a45acf622c 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
@@ -37,4 +37,10 @@ public class ScreenProjectDistributionResultDTO implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date projectCreateTime;
+
+
+ /**
+ * 分类名称 add 21.09.9
+ */
+ private String categoryName;
}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index 543b9d3eb4..a4a6582cf2 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -12,7 +12,8 @@
longitude AS longitude,
latitude AS latitude,
PROJECT_CREATE_TIME AS projectCreateTime,
- CUSTOMER_ID AS customerId
+ CUSTOMER_ID AS customerId,
+ ALL_CATEGORY_NAME as categoryName
FROM
screen_project_data
WHERE
@@ -30,26 +31,23 @@
and org_id = #{agencyId}
-
-
-
- and PROJECT_STATUS_CODE ='pending'
-
-
- and PROJECT_STATUS_CODE ='pending'
-
-
- and PROJECT_STATUS_CODE !='pending'
- and DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(PROJECT_CREATE_TIME)
-
-
- and PROJECT_STATUS_CODE ='pending'
-
-
+
+ and PROJECT_STATUS_CODE ='pending'
+
+
+ and PROJECT_STATUS_CODE ='pending'
+
+
+ and PROJECT_STATUS_CODE !='pending'
+ and DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(PROJECT_CREATE_TIME)
+
order by PROJECT_CREATE_TIME desc
LIMIT #{pageSize}
+
+ LIMIT #{pageSize}
+