修改议题类别统计接口按照一级分类统计

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<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
      * @Author: liuchuang
      * @Date: 2019/9/9 12:26
      */
-    @GetMapping("statistics/{categoryCode}")
+    @GetMapping("statistics/{firstCategoryCode}")
-    public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) {
+    public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String firstCategoryCode) {
-        return issueService.getIssueCategoryStatistics(userDetail, categoryCode);
+        return issueService.getIssueCategoryStatistics(userDetail, firstCategoryCode);
     }
 
     /**

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}")
+    @GetMapping("statistics/{firstCategoryCode}")
-    public Result<ItemCategoryStatisticsResultDTO> itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) {
+    public Result<ItemCategoryStatisticsResultDTO> itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String firstCategoryCode) {
-        return itemService.getItemCategoryStatistics(userDetail, categoryCode);
+        return itemService.getItemCategoryStatistics(userDetail, firstCategoryCode);
     }
 
     /**

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<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
      * @Author: liuchuang
      * @Date: 2019/9/9 12:27
      */
-    Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryCode);
+    Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String firstCategoryCode);
 
     /**
      * 议题处理进度

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<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String categoryCode);
+    Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String firstCategoryCode);
 
     /**
      * 项目处理进度

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<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryCode) {
+    public Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String firstCategoryCode) {
         if (null == userDetail) {
             return new Result<IssueCategoryStatisticsResultDTO>().error("获取用户信息失败");
         }
         IssueCategoryStatisticsFormDTO formDto = new IssueCategoryStatisticsFormDTO();
-        formDto.setCategoryCode(categoryCode);
+        formDto.setFirstCategoryCode(firstCategoryCode);
         formDto.setGridId(userDetail.getGridId());
         return issueFeignClient.issueCategoryStatistics(formDto);
     }

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<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String categoryCode) {
+    public Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String firstCategoryCode) {
         if (null == userDetail) {
             return new Result<ItemCategoryStatisticsResultDTO>().error("获取用户信息失败");
         }
         ItemCategoryStatisticsFormDTO formDto = new ItemCategoryStatisticsFormDTO();
-        formDto.setCategoryCode(categoryCode);
+        formDto.setFirstCategoryCode(firstCategoryCode);
         formDto.setGridId(userDetail.getGridId());
         return itemFeignClient.itemCategoryStatistics(formDto);
     }

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;
 }

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;
 }

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}
     </select>
 
     <resultMap id="issuesAndEventsOfMineMap" type="com.elink.esua.epdc.dto.issue.result.IssuesAndEventsOfMineResultDTO">

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}
     </select>
 
     <select id="selectListOfPendingHandleItems" resultType="com.elink.esua.epdc.dto.item.ItemPendingHandleDTO">