Merge remote-tracking branch 'remotes/origin/dev'

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;
 
     /**
@@ -31,9 +32,9 @@ public class ScreenProjectDistributionFormDTO implements Serializable {
     private String agencyId;
 
 
-    /**
+   /* *//**
      * 不必填；默认查询的是处理中；可选值：all: 全部，pending：处理中   已结案：closed_case  ；已关闭：closed
      * 默认查询pending
-     */
-    private String status;
+     *//*
+    private String status;*/
 }

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);
 

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);
     }
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml

@@ -27,13 +27,23 @@
             <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'
+                    and DATE_SUB(CURDATE(), INTERVAL 30 DAY) &lt;= date(PROJECT_CREATE_TIME)
                 </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},'%')