zcloud_gbs
/
zcloud_gbs_basic_info_gwj
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

main
zhaokai 2026-01-08 16:40:32 +08:00
parent d3995012f2 950000689d
commit 466880a26a
8 changed files with 64 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java
View File

@ -51,10 +51,16 @@ public class CorpInfoController {
@ApiOperation("分页")
@PostMapping("/list")
@PreAuthorize("@pms.hasAnyPermission('zgszhgl','zgsqyxxgl','gszhxxgl','qyd-xgf-zhgl')")
public PageResponse<CorpInfoCO> page(@Validated @RequestBody CorpInfoPageQry qry) {
return corpInfoService.listPage(qry);
}
@ApiOperation("分页")
@PostMapping("/basicList")
@PreAuthorize("@pms.hasAnyPermission('zgszhgl','zgsqyxxgl','gszhxxgl','qyd-xgf-zhgl')")
public PageResponse<CorpInfoCO> pageBasic(@Validated @RequestBody CorpInfoPageQry qry) {
return corpInfoService.listPageBasic(qry);
}
@ApiOperation("分页")
@PostMapping("/listNoPms")

27
web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java
View File

@ -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<CorpInfoCO> executeBasic(CorpInfoPageQry corpInfoPageQry) {
Map<String, Object> parmas = PageQueryHelper.toHashMap(corpInfoPageQry);
if (corpInfoPageQry.getLeCreateTime() != null) {
parmas.put("leCreateTime", corpInfoPageQry.getLeCreateTime().plusDays(1));
}
PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listBasicPage(parmas);
List<CorpInfoCO> 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<CorpInfoCO> examCenterCOS, PageResponse<CorpInfoDO> pageResponse){
//examCenterCOS获取id集合
List<Long> corpInfoIdList = examCenterCOS.stream().map(CorpInfoCO::getId).collect(Collectors.toList());
List<CorpFormDO> 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<CorpInfoCO> executeNoPms(CorpInfoPageQry corpInfoPageQry) {

5
web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java
View File

@ -42,6 +42,11 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
return corpInfoQueryExe.execute(qry);
}
@Override
public PageResponse<CorpInfoCO> listPageBasic(CorpInfoPageQry qry) {
return corpInfoQueryExe.executeBasic(qry);
}
@Override
public PageResponse<CorpInfoCO> listPageNoPms(CorpInfoPageQry qry) {

1
web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java
View File

@ -18,6 +18,7 @@ import java.util.List;
*/
public interface CorpInfoServiceI {
PageResponse<CorpInfoCO> listPage(CorpInfoPageQry qry);
PageResponse<CorpInfoCO> listPageBasic(CorpInfoPageQry qry);
PageResponse<CorpInfoCO> listPageNoPms(CorpInfoPageQry qry);
MultiResponse<CorpInfoCO> listAll(CorpInfoQry corpInfoQry);

3
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java
View File

@ -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<CorpInfoDO> {
@ -28,6 +28,7 @@ public interface CorpInfoMapper extends BaseMapper<CorpInfoDO> {
IPage<CorpInfoDO> corpUserMiddlePage(IPage<CorpInfoDO> iPage, Map<String, Object> params, String menuPerms);
IPage<CorpInfoDO> selectUserPage(IPage<CorpInfoDO> iPage, @Param("ew") QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms);
IPage<CorpInfoDO> selectUserBasicPage(IPage<CorpInfoDO> iPage, @Param("ew") QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms);
IPage<CorpInfoDO> selectUserPageNoPms(IPage<CorpInfoDO> iPage, @Param("ew") QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms);

1
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java
View File

@ -15,6 +15,7 @@ import java.util.Map;
*/
public interface CorpInfoRepository extends BaseRepository<CorpInfoDO> {
PageResponse<CorpInfoDO> listPage(Map<String, Object> parmas);
PageResponse<CorpInfoDO> listBasicPage(Map<String, Object> parmas);
PageResponse<CorpInfoDO> listPageNoPms(Map<String, Object> parmas);
List<CorpInfoDO> listAll(Map<String, Object> params);

20
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
View File

@ -66,21 +66,33 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
public PageResponse<CorpInfoDO> listPage(Map<String, Object> params) {
IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
String menuPerms = "";
initParams(queryWrapper, menuPerms, params);
IPage<CorpInfoDO> result = corpInfoMapper.selectUserPage(iPage, queryWrapper, menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public PageResponse<CorpInfoDO> listBasicPage(Map<String, Object> params) {
IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
String menuPerms = "";
initParams(queryWrapper, menuPerms, params);
IPage<CorpInfoDO> result = corpInfoMapper.selectUserBasicPage(iPage, queryWrapper, menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
private void initParams(QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms, Map<String, Object> params){
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
List<Integer> 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<CorpInfoDO> result = corpInfoMapper.selectUserPage(iPage, queryWrapper, menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public PageResponse<CorpInfoDO> listPageNoPms(Map<String, Object> params) {
IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);

7
web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml
View File

@ -46,7 +46,12 @@
<select id="selectUserPage" resultType="com.zcloud.basic.info.persistence.dataobject.CorpInfoDO">
SELECT *
FROM corp_info
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectUserBasicPage" resultType="com.zcloud.basic.info.persistence.dataobject.CorpInfoDO">
SELECT *
FROM corp_info
${ew.customSqlSegment}
</select>
<select id="selectUserPageNoPms" resultType="com.zcloud.basic.info.persistence.dataobject.CorpInfoDO">