Merge remote-tracking branch 'origin/feature/shenyan_shangbao' into feature/shenyan_shangbao

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java

@@ -134,4 +134,14 @@ public class ItemAppealPageResultDTO implements Serializable {
      */
     private String processState;
 
+    /**
+     * 是否是难点堵点：0否1是
+     */
+    private String isDifficulty;
+
+    /**
+     * 是否典型案例：0否1是
+     */
+    private String isTypical;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@@ -111,7 +111,7 @@ public class ItemController {
     }
 
     /**
-     * 在党群E家流转中，尚未报到区平台的项目列表
+     * 在党群E家流转中，尚未报到区平台的项目列表（难点堵点）
      *
      * @param params
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.item.ItemPendingHandleDTO>>

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java

@@ -278,4 +278,9 @@ public class ItemEntity extends BaseEpdcEntity {
      * 是否市平台督办：0否1是
      */
     private String isWhistle;
+
+    /**
+     * 是否典型案例：0否1是
+     */
+    private String isTypical;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -68,7 +68,7 @@ public interface ItemService extends BaseService<ItemEntity> {
     PageData<ItemPendingHandleDTO> listOfItemsForPCEnd(Map<String, Object> params);
 
     /**
-     * 在党群E家流转中，尚未报到区平台的项目列表
+     * 在党群E家流转中，尚未报到区平台的项目列表（难点堵点）
      *
      * @param params
      * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.ItemPendingHandleDTO>

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

@@ -714,6 +714,7 @@
         WHERE item.DEL_FLAG = '0'
         and (process.state is not null and process.state not in (11,15))
         and item.IS_PEOPLE = '1'
+        and item.IS_DIFFICULTY = '1'
         <if test="typeKey != null and typeKey != '' and typeKey == 'grid_party'">
             and (process.state != 0 or process.state is null)
         </if>
@@ -779,8 +780,6 @@
         item.CREATED_TIME DESC
     </select>
 
-
-
     <select id="firstCheckPage" resultType="com.elink.esua.epdc.dto.item.ItemPendingHandleDTO">
         SELECT
         item.ID,
@@ -2157,6 +2156,8 @@
                     else ''
                     end as evaluationScoreName,
                 process.state AS processState,
+                i.IS_DIFFICULTY,
+                i.IS_TYPICAL,
                 i.EVALUATION_CONTENT,
                 i.EVALUATION_TIME
         FROM epdc_item i

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml

@@ -319,6 +319,6 @@
         AND a.type_key != 'street_dept'
         AND a.type_key != 'district_dept'
         GROUP BY a.id
-        ORDER BY a.sort
+        ORDER BY a.sort, CONVERT(a.`name` USING gbk) ASC
     </select>
 </mapper>