平阴项目分布接口调整

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;

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

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 @@
             <if test="ids == null and agencyId != null">
                 and org_id = #{agencyId}
             </if>
-
+            <if test='level != null and "1" == level'>
-            <choose>
+                and PROJECT_STATUS_CODE ='pending'
-                <when test='level != null and "1" == level'>
+            </if>
-                    and PROJECT_STATUS_CODE ='pending'
+            <if test='level != null and "2" == level'>
-                </when>
+                and PROJECT_STATUS_CODE ='pending'
-                <when test='level != null and "2" == level'>
+            </if>
-                    and PROJECT_STATUS_CODE ='pending'
+            <if test='level != null and "3" == level'>
-                </when>
+                and PROJECT_STATUS_CODE !='pending'
-                <when test='level != null and "3" == level'>
+                and DATE_SUB(CURDATE(), INTERVAL 30 DAY) &lt;= date(PROJECT_CREATE_TIME)
-                    and PROJECT_STATUS_CODE !='pending'
+            </if>
-                    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
         <if test='level != null and "3" == level'>
             LIMIT #{pageSize}
         </if>
+        <if test='level != null and "all" == level'>
+            LIMIT #{pageSize}
+        </if>
     </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},'%')