Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili

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 {
+    // 文化队伍: #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;

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(),
                 formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.queryCoordinateList(formDTO));
         List<CommunitySelfOrganizationListDTO> list=pageInfo.getList();
-        for(CommunitySelfOrganizationListDTO dto:list){
+        for (CommunitySelfOrganizationListDTO dto : list) {
             dto.setColor(SelfOrgCategoryEnum.getEnum(dto.getCategoryCode()).getColor());
         }
         return new PageData<>(list, pageInfo.getTotal());

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -253,7 +253,7 @@ public class IcEventController {
     public Result<List<IcEventAnalysisOrgResDTO>> analysisOrgTotal(@LoginUser TokenDto tokenDto, @RequestBody IcEventCategoryAnalysisFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
-        ValidatorUtils.validateEntity(formDTO,IcEventCategoryAnalysisFormDTO.OrgTotalPie.class);
+        ValidatorUtils.validateEntity(formDTO, IcEventCategoryAnalysisFormDTO.OrgTotalPie.class);
         List<IcEventAnalysisOrgResDTO> list = icEventService.analysisOrgTotal(formDTO);
         return new Result<List<IcEventAnalysisOrgResDTO>>().ok(list);
     }