大屏接口添加诉求类型条件

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;
+
     /**
      * 年月（满意度趋势使用）
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -747,6 +747,9 @@
         <if test="deptId != null and deptId != ''">
             AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
         </if>
+        <if test="peopleFlag != null and peopleFlag != ''">
+            AND item.PEOPLE_FLAG = #{peopleFlag}
+        </if>
         ORDER BY item.CREATED_TIME DESC
     </select>
 
@@ -2356,6 +2359,9 @@
         <if test="deptId != null and deptId != ''">
             AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
         </if>
+        <if test="peopleFlag != null and peopleFlag != ''">
+            AND item.PEOPLE_FLAG = #{peopleFlag}
+        </if>
         group by SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1)
         ORDER BY count(item.ID) desc
     </select>
@@ -2382,6 +2388,9 @@
         <if test="deptId != null and deptId != ''">
             AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
         </if>
+        <if test="peopleFlag != null and peopleFlag != ''">
+            AND item.PEOPLE_FLAG = #{peopleFlag}
+        </if>
         and item.EVALUATION_SCORE is not null
         group by item.EVALUATION_SCORE
         ORDER BY count(item.ID) desc
@@ -2406,6 +2415,9 @@
         <if test="deptId != null and deptId != ''">
             AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
         </if>
+        <if test="peopleFlag != null and peopleFlag != ''">
+            AND item.PEOPLE_FLAG = #{peopleFlag}
+        </if>
         AND DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d') IN
         <foreach collection="timeArr" index="index" item="time" open="(" separator="," close=")">
             #{time}
@@ -2434,6 +2446,9 @@
         <if test="deptId != null and deptId != ''">
             AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
         </if>
+        <if test="peopleFlag != null and peopleFlag != ''">
+            AND item.PEOPLE_FLAG = #{peopleFlag}
+        </if>
         AND DATE_FORMAT(item.CREATED_TIME,'%Y-%m') IN
         <foreach collection="timeArr" index="index" item="time" open="(" separator="," close=")">
             #{time}