diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java index 5e5697d1..ff23ad91 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java @@ -55,6 +55,12 @@ public class CorpInfoController { public PageResponse page(@Validated @RequestBody CorpInfoPageQry qry) { return corpInfoService.listPage(qry); } + + @ApiOperation("分页") + @PostMapping("/listNoPms") + public PageResponse list(@Validated @RequestBody CorpInfoPageQry qry) { + return corpInfoService.listPageNoPms(qry); + } @ApiOperation("所有数据") @GetMapping("/listAll") public MultiResponse listAll(CorpInfoQry corpInfoQry) { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index 31f4fd26..85675750 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -86,6 +86,36 @@ public class CorpInfoQueryExe { }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public PageResponse executeNoPms(CorpInfoPageQry corpInfoPageQry) { + + Map parmas = PageQueryHelper.toHashMap(corpInfoPageQry); + if (corpInfoPageQry.getLeCreateTime() != null) { + parmas.put("leCreateTime", corpInfoPageQry.getLeCreateTime().plusDays(1)); + } + PageResponse pageResponse = corpInfoRepository.listPageNoPms(parmas); + List examCenterCOS = corpInfoCoConvertor.converDOsToCOs(pageResponse.getData()); + if (CollUtil.isEmpty(examCenterCOS)) { + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + //examCenterCOS获取id集合 + List corpInfoIdList = examCenterCOS.stream().map(CorpInfoCO::getId).collect(Collectors.toList()); + List corpFormDOList = corpFormRepository.getCorpListByTypeList(corpInfoIdList, Arrays.asList(CorpFormTypeEnum.SELECTFROM.getCode())); + //corpFormDOList 按照企业分组 + Map> groupedByCorpInfoId = corpFormDOList.stream() + .collect(Collectors.groupingBy(CorpFormDO::getInfoId)); + // 组装营业执照和多选框 + examCenterCOS.forEach(info -> { + if (CollUtil.isNotEmpty(groupedByCorpInfoId) && CollUtil.isNotEmpty(groupedByCorpInfoId.get(info.getId()))) { + //infoByTypeList name按照逗号分隔 + info.setSelectfromString(groupedByCorpInfoId.get(info.getId()).stream() + .map(CorpFormDO::getItemName) + .collect(Collectors.joining(","))); + } + }); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + public MultiResponse executeListAll(CorpInfoQry corpInfoQry) { Map params = PageQueryHelper.toHashMap(corpInfoQry); List corpInfoDOList = corpInfoRepository.listAll(params); diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index 62ffa04b..0d0eeb09 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -43,6 +43,11 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { return corpInfoQueryExe.execute(qry); } + @Override + public PageResponse listPageNoPms(CorpInfoPageQry qry) { + return corpInfoQueryExe.executeNoPms(qry); + } + @Override public MultiResponse listAll(CorpInfoQry corpInfoQry) { return corpInfoQueryExe.executeListAll(corpInfoQry); diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java index b527e2b2..28be4cff 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java @@ -18,6 +18,7 @@ import java.util.List; */ public interface CorpInfoServiceI { PageResponse listPage(CorpInfoPageQry qry); + PageResponse listPageNoPms(CorpInfoPageQry qry); MultiResponse listAll(CorpInfoQry corpInfoQry); SingleResponse add(CorpInfoAddCmd cmd); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java index 6991d371..073940f0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java @@ -29,6 +29,8 @@ public interface CorpInfoMapper extends BaseMapper { IPage selectUserPage(IPage iPage, @Param("ew") QueryWrapper queryWrapper, String menuPerms); + IPage selectUserPageNoPms(IPage iPage, @Param("ew") QueryWrapper queryWrapper, String menuPerms); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java index 0ab35b71..97d96242 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java @@ -15,6 +15,7 @@ import java.util.Map; */ public interface CorpInfoRepository extends BaseRepository { PageResponse listPage(Map parmas); + PageResponse listPageNoPms(Map parmas); List listAll(Map params); Long getCorpCountByCorpName(String corpName); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index 0386f2aa..3b4a2f33 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -81,6 +81,25 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl listPageNoPms(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + if (CollUtil.isNotEmpty(enterpriseType)) { + queryWrapper.in("type", enterpriseType); + } + queryWrapper.orderByAsc("corp_order").orderByDesc("create_time"); + String menuPerms = ""; + if (!ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + queryWrapper.eq("delete_enum", "FALSE"); + IPage result = corpInfoMapper.selectUserPageNoPms(iPage, queryWrapper, menuPerms); + return PageHelper.pageToResponse(result, result.getRecords()); + } + @Override public List listAll(Map params) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml index 49eb639c..87f2e3f6 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -48,5 +48,11 @@ FROM corp_info ${ew.customSqlSegment} + +