From 018dc14a9d79a91ed0d00d6c31b93368622c08fc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 May 2021 17:16:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resigroup/result/RankCodeResultDTO.java | 18 +++++++++++++ .../controller/GroupActController.java | 15 +++++++++++ .../service/resigroup/ResiGroupService.java | 10 +++++++ .../resigroup/impl/ResiGroupServiceImpl.java | 27 +++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/RankCodeResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/RankCodeResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/RankCodeResultDTO.java new file mode 100644 index 0000000000..50d8531978 --- /dev/null +++ b/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; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java index 487b938fbc..a88f86456e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java +++ b/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>().ok(resiGroupService.querySubAnalysisByCode(formDTO)); } + /** + * @return com.epmet.commons.tools.utils.Result> + * @param formDTO + * @author yinzuomei + * @description 004、【支建+联建】排序方式下拉框 + * @Date 2021/5/18 17:14 + **/ + @PostMapping("rankcodelist") + public Result> queryRankCodeList(@RequestBody GroupActCategoryQueryFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,GroupActCategoryQueryFormDTO.AddUserInternalGroup.class); + return new Result>().ok(resiGroupService.queryRankCodeList(formDTO)); + } + + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java index 66c3b991dd..d0cb64fade 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java +++ b/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 querySubAnalysisByCode(SubAnalysisByCodeFormDTO formDTO); + + /** + * 004、【支建+联建】排序方式下拉框 + * + * @param formDTO + * @return com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO + */ + List queryRankCodeList(GroupActCategoryQueryFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java index 141158f063..6d726bba69 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java +++ b/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 queryRankCodeList(GroupActCategoryQueryFormDTO formDTO) { + List resultList=new ArrayList<>(); + RankCodeResultDTO defaultResult=new RankCodeResultDTO(); + defaultResult.setRankCode("orgtotal"); + defaultResult.setRankName("组织活动总次数"); + resultList.add(defaultResult); + List 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; + } }