diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDetailResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDetailResultDTO.java index a52300cc0b..287703b6ef 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDetailResultDTO.java +++ b/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 processList; + /** + * 满意度得分 + */ + private BigDecimal score; + @Data public static class processDTO{ private String processId; diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index 888f8b0938..b7ea753131 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/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' + + and sdd1.AREA_CODE like concat(#{areaCode},'%') + + + + + AND sdd1.ORG_ID = #{agencyId,jdbcType=VARCHAR} + + + AND sdd1.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%') + + + + + AND sdd1.EVENT_STATUS_CODE = #{status} + 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' + + and sdd2.AREA_CODE like concat(#{areaCode},'%') + + + + + AND sdd2.ORG_ID = #{agencyId,jdbcType=VARCHAR} + + + AND sdd2.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%') + + + + + AND sdd2.EVENT_STATUS_CODE = #{status} + ) diff - WHERE - diff.DEL_FLAG = '0' - - and diff.AREA_CODE like concat(#{areaCode},'%') - - - - - AND diff.ORG_ID = #{agencyId,jdbcType=VARCHAR} - - - AND diff.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%') - - - - - AND diff.EVENT_STATUS_CODE = #{status} - ORDER BY CASE #{type} WHEN 'timelongest' THEN diff.EVENT_COST_TIME WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT 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 f45f13aadc..53294f4783 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 @@ -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 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenGovernRankDataDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenGovernRankDataDailyEntity.java index 66b0db7dfa..d2f2c16625 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenGovernRankDataDailyEntity.java +++ b/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; /** * 响应数