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 ff23ad91..11b42064 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 @@ -51,10 +51,16 @@ public class CorpInfoController { @ApiOperation("分页") @PostMapping("/list") - @PreAuthorize("@pms.hasAnyPermission('zgszhgl','zgsqyxxgl','gszhxxgl','qyd-xgf-zhgl')") + public PageResponse page(@Validated @RequestBody CorpInfoPageQry qry) { return corpInfoService.listPage(qry); } + @ApiOperation("分页") + @PostMapping("/basicList") + @PreAuthorize("@pms.hasAnyPermission('zgszhgl','zgsqyxxgl','gszhxxgl','qyd-xgf-zhgl')") + public PageResponse pageBasic(@Validated @RequestBody CorpInfoPageQry qry) { + return corpInfoService.listPageBasic(qry); + } @ApiOperation("分页") @PostMapping("/listNoPms") 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 85675750..6ed762d1 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 @@ -69,6 +69,32 @@ public class CorpInfoQueryExe { if (CollUtil.isEmpty(examCenterCOS)) { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + processList(examCenterCOS, pageResponse); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + /** + * 分页 + * + * @param corpInfoPageQry + * @return + */ + public PageResponse executeBasic(CorpInfoPageQry corpInfoPageQry) { + + Map parmas = PageQueryHelper.toHashMap(corpInfoPageQry); + if (corpInfoPageQry.getLeCreateTime() != null) { + parmas.put("leCreateTime", corpInfoPageQry.getLeCreateTime().plusDays(1)); + } + PageResponse pageResponse = corpInfoRepository.listBasicPage(parmas); + List examCenterCOS = corpInfoCoConvertor.converDOsToCOs(pageResponse.getData()); + if (CollUtil.isEmpty(examCenterCOS)) { + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + processList(examCenterCOS, pageResponse); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + private void processList(List examCenterCOS, PageResponse pageResponse){ + //examCenterCOS获取id集合 List corpInfoIdList = examCenterCOS.stream().map(CorpInfoCO::getId).collect(Collectors.toList()); List corpFormDOList = corpFormRepository.getCorpListByTypeList(corpInfoIdList, Arrays.asList(CorpFormTypeEnum.SELECTFROM.getCode())); @@ -84,7 +110,6 @@ public class CorpInfoQueryExe { .collect(Collectors.joining(","))); } }); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } public PageResponse executeNoPms(CorpInfoPageQry corpInfoPageQry) { 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 0d0eeb09..4b4b5453 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 @@ -42,6 +42,11 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { return corpInfoQueryExe.execute(qry); } + @Override + public PageResponse listPageBasic(CorpInfoPageQry qry) { + + return corpInfoQueryExe.executeBasic(qry); + } @Override public PageResponse listPageNoPms(CorpInfoPageQry qry) { 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 28be4cff..7e224654 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 listPageBasic(CorpInfoPageQry qry); PageResponse listPageNoPms(CorpInfoPageQry qry); MultiResponse listAll(CorpInfoQry corpInfoQry); 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 073940f0..a7cf5274 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 @@ -20,7 +20,7 @@ import java.util.Map; */ @Mapper @DataScopes({ - @DataScope(method = "selectUserPage", menuPerms = ""), + @DataScope(method = "selectUserBasicPage", menuPerms = ""), @DataScope(method = "corpUserMiddlePage", menuPerms = ""), }) public interface CorpInfoMapper extends BaseMapper { @@ -28,6 +28,7 @@ public interface CorpInfoMapper extends BaseMapper { IPage corpUserMiddlePage(IPage iPage, Map params, String menuPerms); IPage selectUserPage(IPage iPage, @Param("ew") QueryWrapper queryWrapper, String menuPerms); + IPage selectUserBasicPage(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 97d96242..a71cdf2e 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 listBasicPage(Map parmas); PageResponse listPageNoPms(Map parmas); List listAll(Map params); 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 3b4a2f33..eec5c3c8 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 @@ -66,21 +66,33 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); + String menuPerms = ""; + initParams(queryWrapper, menuPerms, params); + IPage result = corpInfoMapper.selectUserPage(iPage, queryWrapper, menuPerms); + return PageHelper.pageToResponse(result, result.getRecords()); + } + @Override + public PageResponse listBasicPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + String menuPerms = ""; + initParams(queryWrapper, menuPerms, params); + IPage result = corpInfoMapper.selectUserBasicPage(iPage, queryWrapper, menuPerms); + return PageHelper.pageToResponse(result, result.getRecords()); + } + private void initParams(QueryWrapper queryWrapper, String menuPerms, Map params){ 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.selectUserPage(iPage, queryWrapper, menuPerms); - return PageHelper.pageToResponse(result, result.getRecords()); } - @Override public PageResponse listPageNoPms(Map params) { IPage iPage = new Query().getPage(params); diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml index 87f2e3f6..e542e7d9 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -46,7 +46,12 @@ +