Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.DictTreeResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.SysDictDataDTO;
 import com.epmet.dto.result.CorsConfigResultDTO;
 import com.epmet.feign.fallback.EpmetAdminOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -101,4 +102,7 @@ public interface EpmetAdminOpenFeignClient {
 
     @PostMapping("/sys/dict/data/dictlist")
     Result<List<DictListResultDTO>> dictList(@RequestBody DictListFormDTO formDTO);
+
+    @PostMapping("/sys/dict/data/dictDataList/{dictType}")
+    Result<List<SysDictDataDTO>> dictDataList(@PathVariable("dictType") String dictType);
 }

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.dto.result.DictTreeResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.SysDictDataDTO;
 import com.epmet.dto.result.CorsConfigResultDTO;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 
@@ -59,4 +60,9 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli
     public Result<List<DictListResultDTO>> dictList(DictListFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictList", formDTO);
     }
+
+    @Override
+    public Result<List<SysDictDataDTO>> dictDataList(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictDataList", dictType);
+    }
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java

@@ -172,4 +172,9 @@ public class SysDictDataController {
         return new Result<Map<String, String>>().ok(sysDictDataService.dictMap(dictType));
     }
 
+    @PostMapping("dictDataList/{dictType}")
+    public Result<List<SysDictDataDTO>> dictDataList(@PathVariable("dictType") String dictType){
+        List<SysDictDataDTO> list=sysDictDataService.getDictDataList(dictType);
+        return new Result<List<SysDictDataDTO>>().ok(list);
+    }
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/SysDictDataDao.java

@@ -11,6 +11,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.DictTreeResultDTO;
+import com.epmet.dto.SysDictDataDTO;
 import com.epmet.entity.DictData;
 import com.epmet.entity.SysDictDataEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,4 +34,6 @@ public interface SysDictDataDao extends BaseDao<SysDictDataEntity> {
     List<DictListResultDTO> selectDictList(String dictType);
 
     List<DictTreeResultDTO> selectDictData(String dictType);
+
+    List<SysDictDataDTO> selectDictDataList(String dictType);
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java

@@ -90,4 +90,6 @@ public interface SysDictDataService extends BaseService<SysDictDataEntity> {
     Map<String, String> dictMap(String dictType);
 
     List<DictTreeResultDTO> dictListTree(String dictType);
+
+    List<SysDictDataDTO> getDictDataList(String dictType);
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java

@@ -225,4 +225,9 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
         return TreeUtils.buildTree(resultDTOList);
     }
 
+    @Override
+    public List<SysDictDataDTO> getDictDataList(String dictType) {
+        return baseDao.selectDictDataList(dictType);
+    }
+
 }

epmet-admin/epmet-admin-server/src/main/resources/mapper/SysDictDataDao.xml

@@ -33,4 +33,15 @@
             a.sort asc
     </select>
 
+    <select id="selectDictDataList" resultType="com.epmet.dto.SysDictDataDTO">
+        select sd.*
+        from  sys_dict_data sd
+        where sd.DEL_FLAG='0'
+        and sd.dict_type_id=(
+            select st.id
+            from sys_dict_type st
+            where st.DEL_FLAG='0'
+            and st.dict_type=#{dictType}
+        )order by sort asc
+    </select>
 </mapper>

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

@@ -34,6 +34,7 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcCommunitySelfOrganizationDao;
 import com.epmet.dao.IcUserDemandRecDao;
 import com.epmet.dto.IcCommunitySelfOrganizationDTO;
+import com.epmet.dto.SysDictDataDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.*;
@@ -716,20 +717,20 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
      */
     @Override
     public List<SelfOrgCategoryTotalResDTO> querySelfOrgCategoryTotal(String customerId, String staffId) {
-        Result<Map<String, String>> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SELF_ORG_CATEGORY.getCode());
-        if (!dictMapRes.success() || MapUtils.isEmpty(dictMapRes.getData())) {
+        Result<List<SysDictDataDTO>> dictDataListRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SELF_ORG_CATEGORY.getCode());
+        if (!dictDataListRes.success() || CollectionUtils.isEmpty(dictDataListRes.getData())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "社区自组织分类查询异常");
         }
-        CustomerStaffInfoCacheResult staffInfo=getStaffInfo(customerId,staffId);
+        CustomerStaffInfoCacheResult staffInfo = getStaffInfo(customerId, staffId);
         List<SelfOrgCategoryTotalResDTO> list = baseDao.selectCountGroupByCategory(customerId, staffInfo.getAgencyId());
         Map<String, Integer> map = list.stream().collect(Collectors.toMap(SelfOrgCategoryTotalResDTO::getCategoryCode, SelfOrgCategoryTotalResDTO::getTotal, (key1, key2) -> key2));
         List<SelfOrgCategoryTotalResDTO> resultList = new ArrayList<>();
-        for (String key : dictMapRes.getData().keySet()) {
+        for (SysDictDataDTO dict : dictDataListRes.getData()) {
             SelfOrgCategoryTotalResDTO resDTO = new SelfOrgCategoryTotalResDTO();
-            resDTO.setCategoryCode(key);
-            resDTO.setCategoryName(dictMapRes.getData().get(key));
-            resDTO.setTotal(map.containsKey(key) ? map.get(key) : NumConstant.ZERO);
-            resDTO.setColor(SelfOrgCategoryEnum.getEnum(key).getColor());
+            resDTO.setCategoryCode(dict.getDictValue());
+            resDTO.setCategoryName(dict.getDictLabel());
+            resDTO.setTotal(map.containsKey(dict.getDictValue()) ? map.get(dict.getDictValue()) : NumConstant.ZERO);
+            resDTO.setColor(SelfOrgCategoryEnum.getEnum(dict.getDictValue()).getColor());
             resultList.add(resDTO);
         }
         return resultList;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -166,7 +166,7 @@
             so.LONGITUDE AS longitude,
             so.LATITUDE AS latitude,
             so.ID as orgId,
-            so.remark
+            IFNULL(so.remark,'')AS remark
         FROM ic_community_self_organization so
         WHERE so.DEL_FLAG = 0
             AND so.CATEGORY_CODE IS NOT NULL

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java

@@ -60,6 +60,10 @@ public class IcEventYpAnalysisResultDTO {
      */
     private String categoryPids;
 
+    /**
+     * 居民上报的事件的总和
+     */
+    private Integer resiReportEventCount;
     /**
      * 家属
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java

@@ -131,4 +131,11 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
     List<MyReportIcEvResDTO> selectMyReport(MyReportIcEvFormDTO formDTO);
 
     int updateRedDot(@Param("userId") String userId, @Param("icEventId")String icEventId);
+
+    /**
+     * 查询居民上报的时间数量
+     * @param reportorIdCard 上报人的身份证号
+     * @return
+     */
+    Integer getResiReportEventCount(@Param("reportorIdCard") String reportorIdCard);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -611,6 +611,9 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             dependents = getDependents(event.getIdCard());
         }
 
+        // 该居民上报事件总数
+        Integer resiReportEventCount = baseDao.getResiReportEventCount(event.getIdCard());
+
         r.setReportorName(event.getName());
         r.setSourceTypeName(sourceTypeMap.get(event.getSourceType()));
         r.setDependents(dependents);
@@ -618,6 +621,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         r.setCategoryPids(eventCategory.getCategoryPids());
         r.setReportorMobile(event.getMobile());
         r.setReportorIdCard(idCard);
+        r.setResiReportEventCount(resiReportEventCount);
         if (eventCategory != null) {
             r.setCategoryName(categoryDictItem.getParentCategoryName());
         }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -356,4 +356,11 @@
             id = #{icEventId}
             AND DEL_FLAG = '0'
     </update>
+
+    <select id="getResiReportEventCount" resultType="java.lang.Integer">
+        select count(*) c
+        from ic_event e
+        where e.ID_CARD = #{reportorIdCard}
+          and e.DEL_FLAG = '0'
+    </select>
 </mapper>