From 2ba57fbadabd73b56b4496d2924af9d80d489cd0 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 7 Jan 2020 10:08:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=AE=E9=A2=98=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/ApiIssueController.java | 8 ++++---- .../com/elink/esua/epdc/controller/ApiItemController.java | 6 +++--- .../java/com/elink/esua/epdc/service/IssueService.java | 4 ++-- .../java/com/elink/esua/epdc/service/ItemService.java | 2 +- .../elink/esua/epdc/service/impl/IssueServiceImpl.java | 4 ++-- .../com/elink/esua/epdc/service/impl/ItemServiceImpl.java | 4 ++-- .../dto/issue/form/IssueCategoryStatisticsFormDTO.java | 2 +- .../epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java | 2 +- .../src/main/resources/mapper/issue/IssueDao.xml | 2 +- .../src/main/resources/mapper/item/ItemDao.xml | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index 05634c9cf..0e3d5fa20 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java @@ -98,14 +98,14 @@ public class ApiIssueController { /** * 议题分类统计 - * @Params: [userDetail, categoryCode] + * @Params: [userDetail, firstCategoryCode] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang * @Date: 2019/9/9 12:26 */ - @GetMapping("statistics/{categoryCode}") - public Result issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) { - return issueService.getIssueCategoryStatistics(userDetail, categoryCode); + @GetMapping("statistics/{firstCategoryCode}") + public Result issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String firstCategoryCode) { + return issueService.getIssueCategoryStatistics(userDetail, firstCategoryCode); } /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java index 64d80243d..1c795d9de 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java @@ -65,9 +65,9 @@ public class ApiItemController { * @Author: liuchuang * @Date: 2019/9/12 13:26 */ - @GetMapping("statistics/{categoryCode}") - public Result itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) { - return itemService.getItemCategoryStatistics(userDetail, categoryCode); + @GetMapping("statistics/{firstCategoryCode}") + public Result itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String firstCategoryCode) { + return itemService.getItemCategoryStatistics(userDetail, firstCategoryCode); } /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java index 0f543876d..8bcad6404 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java @@ -64,12 +64,12 @@ public interface IssueService { /** * 议题分类统计 - * @Params: [userDetail, categoryCode] + * @Params: [userDetail, firstCategoryCode] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang * @Date: 2019/9/9 12:27 */ - Result getIssueCategoryStatistics(TokenDto userDetail, String categoryCode); + Result getIssueCategoryStatistics(TokenDto userDetail, String firstCategoryCode); /** * 议题处理进度 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java index 5afda54ab..36604cc01 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java @@ -48,7 +48,7 @@ public interface ItemService { * @Author: liuchuang * @Date: 2019/9/12 13:27 */ - Result getItemCategoryStatistics(TokenDto userDetail, String categoryCode); + Result getItemCategoryStatistics(TokenDto userDetail, String firstCategoryCode); /** * 项目处理进度 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 54ede305a..a5575b0db 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -151,12 +151,12 @@ public class IssueServiceImpl implements IssueService { } @Override - public Result getIssueCategoryStatistics(TokenDto userDetail, String categoryCode) { + public Result getIssueCategoryStatistics(TokenDto userDetail, String firstCategoryCode) { if (null == userDetail) { return new Result().error("获取用户信息失败"); } IssueCategoryStatisticsFormDTO formDto = new IssueCategoryStatisticsFormDTO(); - formDto.setCategoryCode(categoryCode); + formDto.setFirstCategoryCode(firstCategoryCode); formDto.setGridId(userDetail.getGridId()); return issueFeignClient.issueCategoryStatistics(formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 94eb09699..e7e2f72fa 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -56,12 +56,12 @@ public class ItemServiceImpl implements ItemService { } @Override - public Result getItemCategoryStatistics(TokenDto userDetail, String categoryCode) { + public Result getItemCategoryStatistics(TokenDto userDetail, String firstCategoryCode) { if (null == userDetail) { return new Result().error("获取用户信息失败"); } ItemCategoryStatisticsFormDTO formDto = new ItemCategoryStatisticsFormDTO(); - formDto.setCategoryCode(categoryCode); + formDto.setFirstCategoryCode(firstCategoryCode); formDto.setGridId(userDetail.getGridId()); return itemFeignClient.itemCategoryStatistics(formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java index 2d59a5a01..767b23aac 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java @@ -23,5 +23,5 @@ public class IssueCategoryStatisticsFormDTO implements Serializable { * 议题类别ID */ @NotBlank(message = "议题类别ID不能为空") - private String categoryCode; + private String firstCategoryCode; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java index 0e675e04e..1efcdb715 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java @@ -24,5 +24,5 @@ public class ItemCategoryStatisticsFormDTO implements Serializable { * 议题类别ID */ @NotBlank(message = "议题类别ID不能为空") - private String categoryCode; + private String firstCategoryCode; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 978341da9..143d2aa45 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -365,7 +365,7 @@ issue.DEL_FLAG = '0' AND issue.ISSUE_STATE = 0 AND issue.GRID_ID = #{gridId} - AND issue.CATEGORY_CODE = #{categoryCode} + AND issue.FIRST_CATEGORY_CODE = #{firstCategoryCode} 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 7d0ebc25f..85c9ce825 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 @@ -369,7 +369,7 @@ item.DEL_FLAG = '0' AND item.ITEM_STATE IN (0, 10) AND item.GRID_ID = #{gridId} - AND item.CATEGORY_CODE = #{categoryCode} + AND item.FIRST_CATEGORY_CODE = #{firstCategoryCode}