From 6fa7143023b51878f92b5831f938125e6f2e0782 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 28 Apr 2021 18:01:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9"projectdistribution"=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/ScreenProjectDistributionFormDTO.java  |  6 +++---
 .../screen/ScreenProjectDataDao.java                |  3 +--
 .../screen/impl/ScreenProjectServiceImpl.java       |  8 ++++----
 .../mapper/screen/ScreenProjectDataDao.xml          | 13 +++++++++++--
 4 files changed, 19 insertions(+), 11 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 aa4a89183e..6a30af17ec 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
@@ -31,9 +31,9 @@ public class ScreenProjectDistributionFormDTO implements Serializable {
     private String agencyId;
 
 
-    /**
+   /* *//**
      * 不必填；默认查询的是处理中；可选值：all: 全部，pending：处理中   已结案：closed_case  ；已关闭：closed
      * 默认查询pending
-     */
-    private String status;
+     *//*
+    private String status;*/
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java
index eeb9831e21..559ce9fe2d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java
@@ -12,8 +12,7 @@ public interface ScreenProjectDataDao {
 
     List<ScreenProjectDistributionResultDTO> projectDistribution(@Param("agencyId") String agencyId,
                                                                  @Param("ids") List<String> ids,
-                                                                 @Param("level") String level,
-                                                                 @Param("status")String status);
+                                                                 @Param("level") String level);
 
     List<String> selectIdsByAreaCode(@Param("areaCode") String areaCode);
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
index c7a1e6cfc5..81be998afb 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
@@ -70,14 +70,14 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
     @Override
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     public Result projectDistribution(ScreenProjectDistributionFormDTO formDTO) {
-        if(StringUtils.isBlank(formDTO.getStatus())){
-            formDTO.setStatus("pending");
-        }
+        // 1：红色：为刚提交未做任何响应处理未结案的项目；
+        // 2：黄色: 至少做过一次响应处理答复但未结案的项目；
+        // 3：绿色：已经结案的项目。
         List<String> areaIds = null;
         if (StringUtils.isNotBlank(formDTO.getAreaCode())){
             areaIds = screenProjectDataDao.selectIdsByAreaCode(formDTO.getAreaCode());
         }
-        List<ScreenProjectDistributionResultDTO> resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),areaIds,formDTO.getLevel(),formDTO.getStatus());
+        List<ScreenProjectDistributionResultDTO> resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),areaIds,formDTO.getLevel());
         return new Result().ok(resultDTOS);
     }
 
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 08e88bbeae..6ea4d594d1 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
@@ -27,13 +27,22 @@
             <if test="ids == null and agencyId != null">
                 and org_id = #{agencyId}
             </if>
+
             <choose>
-                <when test='"all" == status'>
+                <when test='level != null and "1" == level'>
+                    and PROJECT_STATUS_CODE ='pending'
+                </when>
+                <when test='level != null and "2" == level'>
+                    and PROJECT_STATUS_CODE ='pending'
+                </when>
+                <when test='level != null and "3" == level'>
+                    and PROJECT_STATUS_CODE !='pending'
                 </when>
                 <otherwise>
-                    and PROJECT_STATUS_CODE=#{status}
+                    and PROJECT_STATUS_CODE ='pending'
                 </otherwise>
             </choose>
+            order by PROJECT_CREATE_TIME desc
     </select>
     <select id="selectIdsByAreaCode" resultType="java.lang.String">
         select agency_id as id from screen_customer_agency where del_flag = '0' and area_code like concat(#{areaCode},'%')

From 4ce24c95413fc0d1b9d805e39748aaffdf8a220e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 28 Apr 2021 18:11:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9"projectdistribution"=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95,=E7=BB=BF=E7=81=AF=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=BF=9130=E5=A4=A9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/screen/ScreenProjectDataDao.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 6ea4d594d1..2bb8be6086 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
@@ -37,12 +37,13 @@
                 </when>
                 <when test='level != null and "3" == level'>
                     and PROJECT_STATUS_CODE !='pending'
+                    and DATE_SUB(CURDATE(), INTERVAL 30 DAY) &lt;= date(PROJECT_CREATE_TIME)
                 </when>
                 <otherwise>
                     and PROJECT_STATUS_CODE ='pending'
                 </otherwise>
             </choose>
-            order by PROJECT_CREATE_TIME desc
+        order by PROJECT_CREATE_TIME desc
     </select>
     <select id="selectIdsByAreaCode" resultType="java.lang.String">
         select agency_id as id from screen_customer_agency where del_flag = '0' and area_code like concat(#{areaCode},'%')

From 18bd1aab4e5aa6bdba878f975ec58918267eda92 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 28 Apr 2021 18:14:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9"projectdistribution"=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95,level=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/form/ScreenProjectDistributionFormDTO.java        | 1 +
 1 file changed, 1 insertion(+)

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 6a30af17ec..7e7e6794f1 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
@@ -22,6 +22,7 @@ public class ScreenProjectDistributionFormDTO implements Serializable {
     /**
      * 如果为空返回全部；可选值：1:红色事件；2：黄色事件；3：绿色事件
      */
+    @NotBlank(message = "level不能为空")
     private String level;
 
     /**