Merge branches 'yantai_zhengwu_master' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -101,7 +101,8 @@ public interface StrConstant {
     String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135";
     //磐石街道客户Id
     String PS_CUSTOMER_ID = "1580460084738760705";
-
+    //小寨子客户id
+    String XIAOZHAIZI_CUSTOMER_ID="1536638904600752130";
     /**
      * 单位积分,积分上限，积分说明，积分事件
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -119,6 +119,7 @@ public interface EpmetHeartOpenFeignClient {
 
     /**
      * Desc: 获取联建单位名字
+     * 查询项目处理进展时调用
      * @param formDTO
      * @author zxc
      * @date 2022/5/17 17:53

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -239,7 +239,7 @@ public class IcPartyUnitController implements ResultDataResolver {
     }
 
     /**
-     * @Description 按类型统计单位数量
+     * @Description 按类型统计单位数量、可视化平台-社区党建-联建单位分析-饼图展示分类下的联建单位数量
      * @Param dto
      * @Return {@link Result< List< OptionDataResultDTO>>}
      * @Author zhaoqifeng
@@ -248,7 +248,7 @@ public class IcPartyUnitController implements ResultDataResolver {
     @PostMapping("typestatistics")
     public Result<List<OptionDataResultDTO>> typeStatistics(@RequestBody PartyActivityFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return new Result<List<OptionDataResultDTO>>().ok(icPartyUnitService.typeStatistics(formDTO));
+        return new Result<List<OptionDataResultDTO>>().ok(icPartyUnitService.typeStatistics(formDTO.getAgencyId()));
     }
 
     /**
@@ -265,7 +265,8 @@ public class IcPartyUnitController implements ResultDataResolver {
     }
 
     /**
-     * 联建单位-简要信息列表
+     * 可视化平台-社区党建-联建单位分析
+     * 联建单位-简要信息列表展示：单位名称、单位类型
      *
      * @param form
      * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData>
@@ -298,7 +299,7 @@ public class IcPartyUnitController implements ResultDataResolver {
 
     /**
      * 计算区域化党建单位的群众满意度
-     *
+     * 服务完成后，会发mq
      * @param formDTO
      * @return
      */
@@ -311,6 +312,7 @@ public class IcPartyUnitController implements ResultDataResolver {
 
     /**
      * Desc: 获取联建单位名字
+     * 查询项目处理进展时调用
      * @param formDTO
      * @author zxc
      * @date 2022/5/17 17:53
@@ -321,7 +323,8 @@ public class IcPartyUnitController implements ResultDataResolver {
     }
 
     /**
-     * Desc: 协办单位列表
+     * Desc: 协办单位列表、本来是前端调用，后面需求升级，联建单位+社区自组织同步到了部门中
+     * 此接口已弃用
      * @param tokenDto
      * @author zxc
      * @date 2022/5/18 13:37

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

@@ -106,13 +106,13 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
     List<OptionDTO> options(IcPartyUnitDTO dto);
 
     /**
-     * @Description 按类型统计单位数量
-     * @Param formDTO
+     * @Description 按类型统计单位数量、可视化平台-社区党建-联建单位分析-饼图展示分类下的联建单位数量
+     * @Param agencyId
      * @Return {@link List< OptionDataResultDTO>}
      * @Author zhaoqifeng
      * @Date 2021/12/8 14:56
      */
-    List<OptionDataResultDTO> typeStatistics(PartyActivityFormDTO formDTO);
+    List<OptionDataResultDTO> typeStatistics(String agencyId);
 
     /**
      * 联建单位分布
@@ -135,6 +135,7 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
 
     /**
      * Desc: 获取联建单位名字
+     * 查询项目处理进展时调用
      * @param formDTO
      * @author zxc
      * @date 2022/5/17 17:53
@@ -151,7 +152,8 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
 
 
     /**
-     * 联建单位-简要信息列表
+     * 可视化平台-社区党建-联建单位分析
+     * 联建单位-简要信息列表展示：单位名称、单位类型
      *
      * @param form
      */

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

@@ -377,15 +377,15 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
     }
 
     /**
-     * @param formDTO
-     * @Description 按类型统计单位数量
+     * @param agencyId
+     * @Description 按类型统计单位数量、可视化平台-社区党建-联建单位分析-饼图展示分类下的联建单位数量
      * @Param formDTO
      * @Return {@link List<OptionDataResultDTO>}
      * @Author zhaoqifeng
      * @Date 2021/12/8 14:56
      */
     @Override
-    public List<OptionDataResultDTO> typeStatistics(PartyActivityFormDTO formDTO) {
+    public List<OptionDataResultDTO> typeStatistics(String agencyId) {
         DictListFormDTO dictFromDTO = new DictListFormDTO();
         dictFromDTO.setDictType(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
         Result<List<DictListResultDTO>> dictResult = epmetAdminOpenFeignClient.dictList(dictFromDTO);
@@ -393,7 +393,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
             throw new EpmetException(dictResult.getCode());
         }
 
-        List<OptionDataResultDTO> list = baseDao.getTypeStatistics(formDTO.getAgencyId());
+        List<OptionDataResultDTO> list = baseDao.getTypeStatistics(agencyId);
         Map<String, String> map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue));
 
         return dictResult.getData().stream().map(item -> {
@@ -456,6 +456,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
 
     /**
      * Desc: 获取联建单位名字
+     * 查询项目处理进展时调用
      * @param formDTO
      * @author zxc
      * @date 2022/5/17 17:53
@@ -491,6 +492,12 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         return baseDao.getAssistanceUnitList(staffInfo.getAgencyId(),agencyInfo.getPid());
     }
 
+    /**
+     * 可视化平台-社区党建-联建单位分析
+     * 联建单位-简要信息列表展示：单位名称、单位类型
+     *
+     * @param form
+     */
     @Override
     public PageData getListbrief(PartyUnitListbriefFormDTO form) {
         Result<Map<String, String>> unitTypeMap = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java

@@ -186,7 +186,8 @@ public class IcTripReportRecordController implements ResultDataResolver {
         //磐石客户
         if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){
             ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class);
-        }else {
+        }else if(StrConstant.XIAOZHAIZI_CUSTOMER_ID.equals(formDTO.getCustomerId())) {
+            //小寨子客户id
             ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class);
         }
         //校验参数