支部建设接口v2

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/RankCodeResultDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dataaggre.dto.resigroup.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 004、【支建+联建】排序方式下拉框
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 17:01
+ */
+@Data
+public class RankCodeResultDTO implements Serializable {
+    private static final long serialVersionUID = 7991057885312015889L;
+    private String rankCode;
+    private String rankName;
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java

@@ -7,6 +7,7 @@ import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO;
+import com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO;
 import com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,4 +72,18 @@ public class GroupActController {
         return new Result<List<SubAnalysisByCodeResultDTO>>().ok(resiGroupService.querySubAnalysisByCode(formDTO));
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO>>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 004、【支建+联建】排序方式下拉框
+     * @Date 2021/5/18 17:14 
+     **/
+    @PostMapping("rankcodelist")
+    public Result<List<RankCodeResultDTO>> queryRankCodeList(@RequestBody GroupActCategoryQueryFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,GroupActCategoryQueryFormDTO.AddUserInternalGroup.class);
+        return new Result<List<RankCodeResultDTO>>().ok(resiGroupService.queryRankCodeList(formDTO));
+    }
+
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java

@@ -4,9 +4,11 @@ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
+import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO;
 import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
+import com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO;
 import com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO;
 
 import java.util.List;
@@ -49,4 +51,12 @@ public interface ResiGroupService {
      * @return com.epmet.dataaggre.dto.resigroup.result.DataCommonDTO
      */
     List<SubAnalysisByCodeResultDTO> querySubAnalysisByCode(SubAnalysisByCodeFormDTO formDTO);
+
+    /**
+     * 004、【支建+联建】排序方式下拉框
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO
+     */
+    List<RankCodeResultDTO> queryRankCodeList(GroupActCategoryQueryFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java

@@ -13,6 +13,7 @@ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
+import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.*;
 import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity;
@@ -244,4 +245,30 @@ public class ResiGroupServiceImpl implements ResiGroupService {
         }
         return resultList;
     }
+
+    /**
+     * 004、【支建+联建】排序方式下拉框
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO
+     */
+    @Override
+    public List<RankCodeResultDTO> queryRankCodeList(GroupActCategoryQueryFormDTO formDTO) {
+        List<RankCodeResultDTO> resultList=new ArrayList<>();
+        RankCodeResultDTO defaultResult=new RankCodeResultDTO();
+        defaultResult.setRankCode("orgtotal");
+        defaultResult.setRankName("组织活动总次数");
+        resultList.add(defaultResult);
+        List<ActCategoryDictDTO> categoryList=resiGroupDao.selectActCategoryDictDTOByPcode(formDTO.getCustomerId(),formDTO.getFirstCategoryCode());
+        if(CollectionUtils.isEmpty(categoryList)){
+            categoryList=resiGroupDao.selectActCategoryDictDTOByPcode(Constant.DEFAULT_CUSTOMER,formDTO.getFirstCategoryCode());
+        }
+        categoryList.forEach(category->{
+            RankCodeResultDTO result=new RankCodeResultDTO();
+            result.setRankCode(category.getCategoryCode());
+            result.setRankName(category.getCategoryName().concat("-组织次数"));
+            resultList.add(result);
+        });
+        return resultList;
+    }
 }