diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java index d2923b071..fe5b319e9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java @@ -30,6 +30,11 @@ public class ScreenTotalFormDTO implements Serializable { */ private String endTime; + /** + * 诉求分类:0民生 1发展 2执法 + */ + private String peopleFlag; + /** * 年月(满意度趋势使用) */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 2ebaf5cd5..8927ab376 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -747,6 +747,9 @@ AND find_in_set(#{deptId},item.ALL_DEPT_IDS) + + AND item.PEOPLE_FLAG = #{peopleFlag} + ORDER BY item.CREATED_TIME DESC @@ -2356,6 +2359,9 @@ AND find_in_set(#{deptId},item.ALL_DEPT_IDS) + + AND item.PEOPLE_FLAG = #{peopleFlag} + group by SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) ORDER BY count(item.ID) desc @@ -2382,6 +2388,9 @@ AND find_in_set(#{deptId},item.ALL_DEPT_IDS) + + AND item.PEOPLE_FLAG = #{peopleFlag} + and item.EVALUATION_SCORE is not null group by item.EVALUATION_SCORE ORDER BY count(item.ID) desc @@ -2406,6 +2415,9 @@ AND find_in_set(#{deptId},item.ALL_DEPT_IDS) + + AND item.PEOPLE_FLAG = #{peopleFlag} + AND DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d') IN #{time} @@ -2434,6 +2446,9 @@ AND find_in_set(#{deptId},item.ALL_DEPT_IDS) + + AND item.PEOPLE_FLAG = #{peopleFlag} + AND DATE_FORMAT(item.CREATED_TIME,'%Y-%m') IN #{time}