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

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemLawSubmitDTO.java

@@ -160,6 +160,11 @@ public class ItemLawSubmitDTO implements Serializable {
      */
     private String itemVoice;
 
+    /**
+     * 语音时长
+     */
+    private int duration;
+
     /**
      * 图片
      */

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

@@ -39,14 +39,6 @@ public class ItemAppealDetailResultDTO implements Serializable {
      * 图片
      */
     private List<String> images;
-    /**
-     * 语音
-     */
-    private String voice;
-    /**
-     * 语音时长
-     */
-    private String duration;
     /**
      * 地址
      */
@@ -80,6 +72,12 @@ public class ItemAppealDetailResultDTO implements Serializable {
      */
     private String itemVoice;
 
+    /**
+     * 语音时长
+     */
+    private int duration;
+
+
     /**
      * 联系人
      */

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.item.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 @Data
@@ -87,7 +88,7 @@ public class ItemAppealLawDetailResultDTO implements Serializable {
     /**
      * 报到时间
      */
-    private String reportTime;
+    private Date reportTime;
 
     /**
      * 报到地点

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

@@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.item.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @program: esua-epdc
@@ -22,21 +21,16 @@ public class ItemAppealPageResultDTO implements Serializable {
     private String id;
 
     /**
-     * 用户昵称
+     * 提交人
      */
     private String nickName;
 
 
     /**
-     * 内容
+     * 项目内容
      */
     private String itemContent;
 
-    /**
-     * 发布时间
-     */
-    private Date distributeTime;
-
 
     /**
      * 网格
@@ -60,12 +54,12 @@ public class ItemAppealPageResultDTO implements Serializable {
 
 
     /**
-     * 诉求分类：0民生 1发展 2执法
+     * 诉求分类：0民生诉求 1发展诉求 2执法诉求
      */
     private String peopleFlag;
 
     /**
-     * 诉求分类：0民生 1发展 2执法
+     * 诉求分类：0民生诉求 1发展诉求 2执法诉求
      */
     private String peopleFlagName;
 

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

@@ -0,0 +1,50 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description:
+ * @author: wangtong
+ * @create: 2022-09-03 15:26
+ **/
+@Data
+public class ItemExaminePageResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 提交人
+     */
+    private String nickName;
+
+
+    /**
+     * 项目内容
+     */
+    private String itemContent;
+
+
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 最后一次处理时间
+     */
+    private String lastHandleTime;
+
+
+    /**
+     * 上报时间
+     */
+    private String createdTime;
+}

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

@@ -315,5 +315,19 @@ public class ItemController {
     public Result<ItemAppealDetailResultDTO> getItemAppealDetail(@PathVariable("id") String id){
         return itemService.getItemAppealDetail(id);
     }
+
+
+    /**
+    * @describe: 获取社区结案审批列表
+    * @author wangtong
+    * @date 2022/9/4 17:44
+    * @params [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>>
+    */
+    @GetMapping("getExaminePage")
+    public Result<PageData<ItemExaminePageResultDTO>> getExaminePage(@RequestParam Map<String, Object> params) {
+        PageData<ItemExaminePageResultDTO> page = itemService.getExaminePage(params);
+        return new Result<PageData<ItemExaminePageResultDTO>>().ok(page);
+    }
 }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -409,4 +409,13 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO>>
      */
     List<ItemResultDTO> getLawItemList(ItemAppealPageDTO formDto);
+
+    /**
+    * @describe: 获取社区结案审批列表
+    * @author wangtong
+    * @date 2022/9/4 17:53
+    * @params [params]
+    * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemExaminePageResultDTO>
+    */
+    List<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params);
 }

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

@@ -509,4 +509,12 @@ public interface ItemService extends BaseService<ItemEntity> {
      */
     Result<List<ItemResultDTO>> getLawItemList(ItemAppealPageDTO dto);
 
+    /**
+     * @describe: 获取社区结案审批列表
+     * @author wangtong
+     * @date 2022/9/4 17:44
+     * @params [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>>
+     */
+    PageData<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params);
 }

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

@@ -2239,4 +2239,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return new Result<List<ItemResultDTO>>().ok(list);
     }
 
+    @Override
+    public PageData<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params) {
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RuntimeException("获取用户信息失败");
+        }
+        params.put("deptId", user.getDeptId());
+        IPage<ItemExaminePageResultDTO> page = getPage(params);
+        List<ItemExaminePageResultDTO> list = baseDao.getExaminePage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
 }

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

@@ -1310,6 +1310,7 @@
         <result property="categoryName" column="CATEGORY_NAME"/>
         <result property="peopleFlag" column="PEOPLE_FLAG"/>
         <result property="itemVoice" column="ITEM_VOICE"/>
+        <result property="duration" column="DURATION"/>
         <result property="contactName" column="CONTACT_NAME"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
@@ -1332,9 +1333,10 @@
             item.PEOPLE_FLAG,
             img.IMG_URL,
             item.ITEM_VOICE,
+            item.DURATION,
             item.CONTACT_NAME
         FROM epdc_item item
-            LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
+            LEFT JOIN epdc_img img ON item.id = img.REFERENCE_ID
                         AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'items'
         WHERE
             item.DEL_FLAG = '0'
@@ -1384,4 +1386,39 @@
         img.IMG_URL
         LIMIT #{pageIndex},#{pageSize}
     </select>
+    <select id="getExaminePage" resultType="com.elink.esua.epdc.dto.item.result.ItemExaminePageResultDTO">
+        select i.id,
+			 i.NICK_NAME,
+			 i.ITEM_CONTENT,
+			 i.LAST_HANDLE_TIME,
+			 i.CREATED_TIME
+        from epdc_item i
+        where i.DEL_FLAG='0'
+                    and i.id in (
+                                 SELECT
+                        temp.ITEM_ID
+                        FROM
+                        ( select it.*
+                                from epdc_item_handle_process it
+                                inner join (select *,max(CREATED_TIME) as maxTime
+                                from epdc_item_handle_process
+                                where DEL_FLAG='0'
+                                group by ITEM_ID
+                        )max_it on it.ITEM_ID=max_it.ITEM_ID
+                                                and it.CREATED_TIME=max_it.maxTime
+                        where it.DEL_FLAG='0'
+                                        and it.dept_id=#{deptId}
+                                        and it.STATE=11
+                        ) temp)
+        <if test="itemContent != null and itemContent != ''">
+            and i.ITEM_CONTENT like '%${itemContent}%'
+        </if>
+        <if test="userName != null and userName != ''">
+            and i.NICK_NAME like '%${userName}%'
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( i.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        order by i.LAST_HANDLE_TIME desc
+    </select>
 </mapper>