difficultyrank-multic

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDetailResultDTO.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -71,6 +72,11 @@ public class ScreenProjectDetailResultDTO implements Serializable {
      */
     private List<processDTO> processList;
 
+    /**
+     * 满意度得分
+     */
+    private BigDecimal score;
+
     @Data
     public static class processDTO{
         private String processId;

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -286,6 +286,22 @@
             where sdd1.DEL_FLAG='0'
             and scg.DEL_FLAG='0'
             and sdd1.ORG_TYPE='grid'
+            <if test="areaCode != null and areaCode != ''">
+                and sdd1.AREA_CODE like concat(#{areaCode},'%')
+            </if>
+            <if test="areaCode == null || areaCode == ''">
+                <choose>
+                    <when test="orgType != null and orgType == 'grid'">
+                        AND sdd1.ORG_ID = #{agencyId,jdbcType=VARCHAR}
+                    </when>
+                    <otherwise>
+                        AND sdd1.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="status!= null and status != ''">
+                AND sdd1.EVENT_STATUS_CODE = #{status}
+            </if>
             union
             select sca.AREA_CODE,sdd2.* from screen_difficulty_data sdd2
             left join screen_customer_agency sca
@@ -293,25 +309,23 @@
             where sdd2.DEL_FLAG='0'
             and sca.DEL_FLAG='0'
             and sdd2.ORG_TYPE='agency'
-        ) diff
-        WHERE
-            diff.DEL_FLAG = '0'
             <if test="areaCode != null and areaCode != ''">
-            and diff.AREA_CODE like concat(#{areaCode},'%')
+                and sdd2.AREA_CODE like concat(#{areaCode},'%')
             </if>
             <if test="areaCode == null || areaCode == ''">
                 <choose>
                     <when test="orgType != null and orgType == 'grid'">
-                    AND diff.ORG_ID = #{agencyId,jdbcType=VARCHAR}
+                        AND sdd2.ORG_ID = #{agencyId,jdbcType=VARCHAR}
                     </when>
                     <otherwise>
-                    AND diff.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
+                        AND sdd2.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
                     </otherwise>
                 </choose>
             </if>
             <if test="status!= null and status != ''">
-            AND diff.EVENT_STATUS_CODE = #{status}
+                AND sdd2.EVENT_STATUS_CODE = #{status}
             </if>
+        ) diff
         ORDER BY
         CASE #{type}  WHEN 'timelongest' THEN diff.EVENT_COST_TIME
         WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT

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

@@ -69,7 +69,8 @@
             IFNULL(link_mobile,'') as mobile,
             IFNULL(project_address,'') as reportAddress,
             CUSTOMER_ID as customerId,
-            PROJECT_STATUS_CODE as projectStatusCode
+            PROJECT_STATUS_CODE as projectStatusCode,
+            floor( SATISFACTION_SCORE) AS score,
         FROM
             screen_project_data
         WHERE

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenGovernRankDataDailyEntity.java

@@ -18,13 +18,11 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 基层治理-治理能力排行数据(按月统计)
@@ -97,7 +95,7 @@ public class ScreenGovernRankDataDailyEntity extends BaseEpmetEntity {
     /**
      * 满意率
      */
-	private BigDecimal satisfactionRatio;.
+	private BigDecimal satisfactionRatio;
 
 	/**
 	 * 响应数