yinzuomei 3 years ago
parent
commit
07ec1735c6
  1. 15
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SelfOrgCategoryEnum.java
  2. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

15
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SelfOrgCategoryEnum.java

@ -4,16 +4,21 @@ package com.epmet.commons.tools.enums;
* 社区自组织增加分类文化队伍楼委会老友俱乐部治安巡逻队其他 * 社区自组织增加分类文化队伍楼委会老友俱乐部治安巡逻队其他
*/ */
public enum SelfOrgCategoryEnum { public enum SelfOrgCategoryEnum {
// 文化队伍: #e70014
// 楼委会: #f59701
// 老友俱乐部: #8fc41e
// 治安巡逻队: #00a1be
// 其他: #0067b6
/** /**
* 环境变量枚举 * 环境变量枚举
*/ */
WHDW("whdw", "文化队伍", "#0091ed", 1), WHDW("whdw", "文化队伍", "#e70014", 1),
LWH("lwh", "楼委会", "#0091ed", 2), LWH("lwh", "楼委会", "#f59701", 2),
LYJLB("lyjlb", "老友俱乐部", "#0091ed", 3), LYJLB("lyjlb", "老友俱乐部", "#8fc41e", 3),
ZAXLD("zaxld", "治安巡逻队", "#0091ed", 4), ZAXLD("zaxld", "治安巡逻队", "#00a1be", 4),
OTHER("other", "其他", "#0091ed", 5), OTHER("other", "其他", "#0067b6", 5),
; ;
private final String code; private final String code;

2
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@ -771,7 +771,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
PageInfo<CommunitySelfOrganizationListDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(), PageInfo<CommunitySelfOrganizationListDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.queryCoordinateList(formDTO)); formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.queryCoordinateList(formDTO));
List<CommunitySelfOrganizationListDTO> list=pageInfo.getList(); List<CommunitySelfOrganizationListDTO> list=pageInfo.getList();
for(CommunitySelfOrganizationListDTO dto:list){ for (CommunitySelfOrganizationListDTO dto : list) {
dto.setColor(SelfOrgCategoryEnum.getEnum(dto.getCategoryCode()).getColor()); dto.setColor(SelfOrgCategoryEnum.getEnum(dto.getCategoryCode()).getColor());
} }
return new PageData<>(list, pageInfo.getTotal()); return new PageData<>(list, pageInfo.getTotal());

Loading…
Cancel
Save