From 42195a9b00abf93f7a33eff646eadee6b6cf8e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Fri, 22 Nov 2019 13:57:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkItemController.java | 16 ++--- .../esua/epdc/feign/WorkItemFeignClient.java | 6 +- .../fallback/WorkItemFeignClientFallback.java | 4 +- .../service/impl/WorkItemServiceImpl.java | 4 +- .../item/controller/WorkItemController.java | 29 ++++----- .../esua/epdc/modules/item/dao/ItemDao.java | 11 +++- .../modules/item/service/ItemService.java | 2 +- .../item/service/impl/ItemServiceImpl.java | 64 +++++++++++++------ .../main/resources/mapper/item/ItemDao.xml | 61 ++++++++++++++++-- 9 files changed, 138 insertions(+), 59 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java index b346b3444..6acfff89e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java @@ -33,7 +33,7 @@ public class ApiWorkItemController { * @Date: 2019/11/18 13:26 */ @GetMapping("statistics") - public Result itemStatistics(@RequestBody ItemStatisticsFormDTO formDto) { + public Result itemStatistics(ItemStatisticsFormDTO formDto) { return workItemService.getItemStatistics(formDto); } /** @@ -44,8 +44,8 @@ public class ApiWorkItemController { * @Date: 2019/11/19 16:34 */ @GetMapping("list") - public Result> listItems(@RequestBody ItemFormDTO formDto) { - return workItemService.listItems( formDto); + public Result> listItems(ItemFormDTO formDto) { + return workItemService.listItems(formDto); } /** @@ -67,7 +67,7 @@ public class ApiWorkItemController { * @Date: 2019/11/19 16:34 */ @GetMapping("evaluation") - public Result> evaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) { + public Result> evaluation(EvaluationFormDTO evaluationFormDTO) { return workItemService.evaluation(evaluationFormDTO); } /** @@ -83,7 +83,7 @@ public class ApiWorkItemController { } @GetMapping("handleSubmit") - public Result handleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) { + public Result handleSubmit(ItemHandleSubmitFormDTO dto) { return workItemService.handleSubmit(dto); } /** @@ -94,7 +94,7 @@ public class ApiWorkItemController { * @Date: 2019/11/19 16:34 */ @GetMapping("evaluationDept") - public Result> evaluationDept(@RequestBody EvaluationFormDTO evaluationFormDTO) { + public Result> evaluationDept(EvaluationFormDTO evaluationFormDTO) { return workItemService.evaluationDept(evaluationFormDTO); } /** @@ -105,7 +105,7 @@ public class ApiWorkItemController { * @Date: 2019/11/19 16:34 */ @GetMapping("processList") - public Result> processList(@RequestBody ItemProcessFormDTO dto) { + public Result> processList(ItemProcessFormDTO dto) { return workItemService.processList(dto); } @@ -117,7 +117,7 @@ public class ApiWorkItemController { * @Date: 2019/11/19 16:34 */ @GetMapping("notice") - public Result> notice(@RequestBody ItemInformationFormDTO formDto) { + public Result> notice(ItemInformationFormDTO formDto) { return workItemService.notice(formDto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java index a3d1d4df2..5fb34d019 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java @@ -21,7 +21,7 @@ import java.util.List; * @Author LPF * @Date 2019/11/18 16:39 */ -@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class,url ="http://127.0.0.1:9066") public interface WorkItemFeignClient { @@ -51,8 +51,8 @@ public interface WorkItemFeignClient { * @Author: lipengfei * @Date: 2019/11/19 16:42 */ - @GetMapping(value = "events/work/item/detail", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getItemDetail(ItemDetailFormDTO formDto); + @GetMapping(value = "events/work/item/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getItemDetail(@PathVariable String id); /** * 获取满意度评价结果 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java index 9b5185b7f..ad2867457 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java @@ -32,8 +32,8 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItems", formDto); } @Override - public Result getItemDetail(ItemDetailFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemDetail", formDto); + public Result getItemDetail(@PathVariable String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemDetail", id); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java index f01cabe38..c54b9b2b0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java @@ -44,9 +44,7 @@ public class WorkItemServiceImpl implements WorkItemService { @Override public Result getItemDetail(String itemId) { - ItemDetailFormDTO formDto = new ItemDetailFormDTO(); - formDto.setItemId(itemId); - return workItemFeignClient.getItemDetail(formDto); + return workItemFeignClient.getItemDetail(itemId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java index 6e17eff88..b88232e70 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java @@ -40,7 +40,7 @@ public class WorkItemController { /** - * 项目分类统计 + * 项目统计--工作端 * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -52,7 +52,7 @@ public class WorkItemController { return this.itemService.getItemStatistics(formDto); } /** - * 项目列表--移动app端用 + * 项目列表--工作端 * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei @@ -64,7 +64,7 @@ public class WorkItemController { return this.itemService.listItemsByWork(formDto); } /** - * 项目消息列表--移动app端用 + * 项目消息列表--工作端 * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei @@ -77,21 +77,18 @@ public class WorkItemController { return this.itemInformationService.notice(formDto); } /** - * 项目详情--移动app端用 - * @Params: [formDto] + * 项目详情--工作端 + * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:46 */ - @GetMapping("detail") - public Result getItemDetail(@RequestBody ItemDetailFormDTO formDto) { - //略过FormDto不相关检验 - formDto.setUserId("NoUser"); - ValidatorUtils.validateEntity(formDto); - return this.itemService.getItemDetailByWork(formDto); + @GetMapping("detail/{id}") + public Result getItemDetail(@PathVariable String id) { + return this.itemService.getItemDetailByWork(id); } /** - * 工作端-获取满意度评价结果 + * 获取满意度评价结果--工作端 * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -106,7 +103,7 @@ public class WorkItemController { return new Result>().ok(deptEvaluateResultDTOS); } /** - * 工作端-获取可吹哨部门 + * 获取可吹哨部门--工作端 * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 @@ -116,7 +113,7 @@ public class WorkItemController { return this.itemService.whistlingDept(); } /** - * 项目处理提交 + * 项目处理提交--工作端 * @Params: [dto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -128,7 +125,7 @@ public class WorkItemController { return itemService.modifyHandleResult(dto); } /** - * 工作端-获取满意度评价部门 + * 获取满意度评价部门--工作端 * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -143,7 +140,7 @@ public class WorkItemController { return new Result>().ok(evaluateDeptDTOS); } /** - * 工作端-获项目处理进度 + * 获项目处理进度--工作端 * @Params: [ItemProcessFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei 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 0fda7dbea..bfb29ce65 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 @@ -78,6 +78,15 @@ public interface ItemDao extends BaseDao { * @Date: 2019/9/10 20:57 */ ItemDetailResultDTO selectOneItemDetail(ItemDetailFormDTO formDto); + + /** + * 工作端-项目列表 + * @Params: [formDto,deptIdList] + * @Return: java.util.List + * @Author: lipengfei + * @Date: 2019/11/19 16:50 + */ + List selectListOfItemsByWork(ItemFormDTO formDto,List deptIdList); /** * 工作端-项目详情 * @Params: [formDto] @@ -85,7 +94,7 @@ public interface ItemDao extends BaseDao { * @Author: lipengfei * @Date: 2019/9/10 20:57 */ - ItemDetailResultDTO selectOneOfItemDetailForWork(ItemDetailFormDTO formDto); + ItemDetailResultDTO selectOneOfItemDetailForWork(String id); /** 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 2cb32da53..fb9490db6 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 @@ -158,7 +158,7 @@ public interface ItemService extends BaseService { * @Author: lipengfei * @Date: 2019/9/10 20:54 */ - Result getItemDetailByWork(ItemDetailFormDTO formDto); + Result getItemDetailByWork(String id); /** 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 d50068e14..02e689cdb 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 @@ -208,16 +208,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result> listItemsByWork(ItemFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); - // 查询半年内的数据 - formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6)); - // 查询项目状态 0-待处理，5-已关闭，10-已结案 - int[] states = {EventIssueItemState.ITEM_HANDLING,EventIssueItemState.ITEM_CLOSED, EventIssueItemState.ITEM_CLOSEING_CASE}; - List data = baseDao.selectListOfItems(formDto, states); + List data = baseDao.selectListOfItemsByWork(formDto, SecurityUser.getUser().getDeptIdList()); return new Result>().ok(data); } @Override - public Result getItemDetailByWork(ItemDetailFormDTO formDto) { - ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(formDto); + public Result getItemDetailByWork(String id) { + ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(id); return new Result().ok(resultDTO); } @@ -383,21 +379,47 @@ public class ItemServiceImpl extends BaseServiceImpl implem */ @Override public Result> whistlingDept(){ - // 可流转部门 - Result> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId()); - if (!listResult.success()) { - throw new RenException("获取流转协助部门失败"); - } - List deptDTOS = listResult.getData(); - // 初始化可流转部门-街道党工委：街道部门、区直部门 + UserDetail user = SecurityUser.getUser(); List deptResultDTOS = new ArrayList<>(); - for (SysDeptDTO dto : - deptDTOS) { - ItemCirculationDeptResultDTO circulationDeptResultDTO = new ItemCirculationDeptResultDTO(); - circulationDeptResultDTO.setDeptId(dto.getId()); - circulationDeptResultDTO.setDeptName(dto.getName()); - circulationDeptResultDTO.setTypeKey(dto.getTypeKey()); - deptResultDTOS.add(circulationDeptResultDTO); + // 网格-可做操作和可流转部门 + if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) { + // 可流转部门 + Result completeDept = adminFeignClient.getCompleteDept(SecurityUser.getDeptId()); + if (!completeDept.success()) { + throw new RenException("获取流转协助部门失败"); + } + + CompleteDeptDTO completeDeptDTO = completeDept.getData(); + // 直属社区 + ItemCirculationDeptResultDTO circulationDeptCommunityResultDTO = new ItemCirculationDeptResultDTO(); + circulationDeptCommunityResultDTO.setDeptId(completeDeptDTO.getCommunityId()); + circulationDeptCommunityResultDTO.setDeptName(completeDeptDTO.getCommunity()); + circulationDeptCommunityResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY); + deptResultDTOS.add(circulationDeptCommunityResultDTO); + // 直属街道 + ItemCirculationDeptResultDTO circulationDeptStreetResultDTO = new ItemCirculationDeptResultDTO(); + circulationDeptStreetResultDTO.setDeptId(completeDeptDTO.getStreetId()); + circulationDeptStreetResultDTO.setDeptName(completeDeptDTO.getStreet()); + circulationDeptStreetResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); + deptResultDTOS.add(circulationDeptStreetResultDTO); + + } else if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(user.getTypeKey())) { + // 可流转部门 + Result> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId()); + if (!listResult.success()) { + throw new RenException("获取流转协助部门失败"); + } + List deptDTOS = listResult.getData(); + // 初始化可流转部门-街道党工委：街道部门、区直部门 + for (SysDeptDTO dto : + deptDTOS) { + ItemCirculationDeptResultDTO circulationDeptResultDTO = new ItemCirculationDeptResultDTO(); + circulationDeptResultDTO.setDeptId(dto.getId()); + circulationDeptResultDTO.setDeptName(dto.getName()); + circulationDeptResultDTO.setTypeKey(dto.getTypeKey()); + deptResultDTOS.add(circulationDeptResultDTO); + } + } return new Result>().ok(deptResultDTOS); } 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 b7e19476b..72b83c103 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 @@ -37,10 +37,6 @@ item.USER_FACE, item.IS_PARTY_MEMBER, item.CREATED_TIME, - item.ISSUE_ADDRESS, - eve.APPROVE_NUM, - eve.OPPOSE_NUM, - eve.COMMENT_NUM, ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum, cate.CATEGORY_NAME, img.IMG_URL, @@ -116,6 +112,63 @@ item.CREATED_TIME DESC, img.IMG_URL +