diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemLawSubmitDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemLawSubmitDTO.java index e2e0d4896..4440657b6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemLawSubmitDTO.java +++ b/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; + /** * 图片 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java index 31d3a4a3a..466f8de3c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java +++ b/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 images; - /** - * 语音 - */ - private String voice; - /** - * 语音时长 - */ - private String duration; /** * 地址 */ @@ -80,6 +72,12 @@ public class ItemAppealDetailResultDTO implements Serializable { */ private String itemVoice; + /** + * 语音时长 + */ + private int duration; + + /** * 联系人 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealLawDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealLawDetailResultDTO.java index 493d1aef6..1811c7ac9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealLawDetailResultDTO.java +++ b/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; /** * 报到地点 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java index 15e17672a..a60147b46 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemExaminePageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemExaminePageResultDTO.java new file mode 100644 index 000000000..290a8d1ae --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 61e72e35a..0517b6734 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/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 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> + */ + @GetMapping("getExaminePage") + public Result> getExaminePage(@RequestParam Map params) { + PageData page = itemService.getExaminePage(params); + return new Result>().ok(page); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 33c45d2af..92a69ca7e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/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 { * @return com.elink.esua.epdc.commons.tools.utils.Result> */ List getLawItemList(ItemAppealPageDTO formDto); + + /** + * @describe: 获取社区结案审批列表 + * @author wangtong + * @date 2022/9/4 17:53 + * @params [params] + * @return java.util.List + */ + List getExaminePage(Map params); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 9f6f88d3b..5266243d5 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/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 { */ Result> getLawItemList(ItemAppealPageDTO dto); + /** + * @describe: 获取社区结案审批列表 + * @author wangtong + * @date 2022/9/4 17:44 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + PageData getExaminePage(Map params); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 63567ea75..89b56db3f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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 implem return new Result>().ok(list); } + @Override + public PageData getExaminePage(Map params) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RuntimeException("获取用户信息失败"); + } + params.put("deptId", user.getDeptId()); + IPage page = getPage(params); + List list = baseDao.getExaminePage(params); + return new PageData<>(list, page.getTotal()); + } + } 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 677014cbc..955009cf6 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 @@ -1310,6 +1310,7 @@ + @@ -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} +