diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 89bb48135..fe1e76342 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 89bb48135eb0db7b1682b1e7d51b0bd5c8d02a0f +Subproject commit fe1e76342cc6631c5d178c1edc35bfb8d7416776 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemWhistle2GovFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemWhistle2GovFormDTO.java new file mode 100644 index 000000000..7f19d48fd --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemWhistle2GovFormDTO.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * 吹哨给市平台 + * + * @author zhy + * @date 2022/10/24 14:11 + */ +@Data +public class ItemWhistle2GovFormDTO implements Serializable { + private static final long serialVersionUID = -5395350316792859552L; + + /** + * 项目ID + */ + @NotBlank(message = "项目ID不能为空") + private String id; + + /** + * 处理意见(内部) + */ + @Size(min = 1, max = 500, message = "处理意见在500字以内") + private String reason; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java index 222ea4127..fa477e4f1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java @@ -17,6 +17,10 @@ public enum ItemHandleCategoryEnum { HANDLE_I_HANDLE_GRID(12, "响应拟办"),// 等同于网格回应 2022.9.4需求变更 HANDLE_I_HANDLE_COMMUNITY(13, "直接办理"),// 等同于社区回应 2022.9.4需求变更 HANDLE_I_HANDLE_COMMUNITY_REJECT(14, "社区驳回"),// 2022.9.4需求变更 + /** + * 吹哨市平台 + */ + HANDLE_I_HANDLE_GOV_WHISTLE(16, "吹哨上报"), HANDLE_CIRCULATION_ASSISTANCE(1, "吹哨"), HANDLE_CLOSE(5, "不予受理"), // 之前的关闭 2022.9.4需求变更 HANDLE_CLOSE_APPLY(6, "不予受理申请"), // 2022.9.7需求变更 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 fb242bfca..2ac9302d0 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 @@ -76,6 +76,20 @@ public class ItemController { return new Result>().ok(page); } + /** + * 在党群E家流转中,尚未报到区平台的项目列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhy + * @date 2022/10/24 15:15 + */ + @GetMapping("epdcpage") + public Result> epdcPage(@RequestParam Map params) { + PageData page = itemService.listEpdcItems(params); + return new Result>().ok(page); + } + /** * 项目驳回列表 * @@ -454,6 +468,20 @@ public class ItemController { return new Result>().ok(itemService.getItemListByAddress(params)); } + /** + * 吹哨上报-吹哨给市级青诉即办平台 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2022/10/21 16:13 + */ + @PostMapping("whistle") + public Result whistle2Gov(@RequestBody ItemWhistle2GovFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return itemService.whistle2Gov(formDTO); + } + /** * 市级青诉即办平台对区(市)诉求进行在线督办 * 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 5f7fa936a..6cd909d93 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 @@ -160,6 +160,8 @@ public interface ItemDao extends BaseDao { */ List selectListOfPendingHandleItems(Map params); + List listEpdcItems(Map params); + List listEqPc(ItemWorkListFormDTO formDTO); List itemPageList(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 0bb224ec7..770030583 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 @@ -66,6 +66,9 @@ public interface ItemService extends BaseService { * @Date: 2019/9/12 18:17 */ PageData listOfItemsForPCEnd(Map params); + + PageData listEpdcItems(Map params); + List listEqPc(ItemWorkListFormDTO formDTO); PageData itemPageList(Map params); @@ -663,6 +666,16 @@ public interface ItemService extends BaseService { List getItemListByAddress(Map params); + /** + * 吹哨上报-吹哨给市级青诉即办平台 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2022/10/21 16:16 + */ + Result whistle2Gov(ItemWhistle2GovFormDTO formDTO); + /** * 接受市平台诉求督办 * 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 b6cf5c5f7..b202b8f35 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 @@ -272,6 +272,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new PageData<>(list, page.getTotal()); } + @Override + public PageData listEpdcItems(Map params) { + IPage page = getPage(params); + List list = baseDao.listEpdcItems(params); + Map map = listItemHandleDept(); + list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId()))); + return new PageData<>(list, page.getTotal()); + } + @Override public PageData itemPageList(Map params) { IPage page = getPage(params); @@ -4069,6 +4078,24 @@ public class ItemServiceImpl extends BaseServiceImpl implem return baseDao.getItemListByAddress(params); } + @Override + public Result whistle2Gov(ItemWhistle2GovFormDTO formDTO) { + ItemHandleProcessEntity process = new ItemHandleProcessEntity(); + ItemEntity item = baseDao.selectById(formDTO.getId()); + if (item == null) { + return new Result().error("未查到相关项目,项目ID:" + formDTO.getId()); + } + process.setItemId(item.getId()); + process.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GOV_WHISTLE.getValue()); + process.setHandleAdvice(formDTO.getReason()); + process.setOutHandleAdvice(formDTO.getReason()); + process.setHandlerDept(SecurityUser.getUser().getDeptName()); + process.setHandlerDeptId(SecurityUser.getDeptId()); + itemHandleProcessDao.insert(process); + + return new Result(); + } + @Override public Result supervise(AppealSuperviseResultDTO formDTO) { ItemHandleProcessEntity process = new ItemHandleProcessEntity(); 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 59733f10e..7406f776c 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 @@ -613,21 +613,21 @@ ) temp ) - - AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} - - - AND (item.GRID_ID = #{gridId} - OR find_in_set(#{gridId},item.ALL_DEPT_IDS)) - - - AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS) - OR find_in_set(#{streetId},item.ALL_DEPT_IDS)) - - - AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS) - OR find_in_set(#{communityId},item.ALL_DEPT_IDS)) - + + AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + + + AND (item.GRID_ID = #{gridId} + OR find_in_set(#{gridId},item.ALL_DEPT_IDS)) + + + AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},item.ALL_DEPT_IDS)) + + + AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},item.ALL_DEPT_IDS)) + AND item.ITEM_CODE like concat('%', #{itemCode}, '%') @@ -644,6 +644,138 @@ item.CREATED_TIME DESC + +