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 7c5b6bd..0cbd510 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 @@ -115,7 +115,7 @@ public class CorpInfoQueryExe { public PageResponse corpUserMiddlePage(CorpUserMiddleQry qry) { Map parmas = PageQueryHelper.toHashMap(qry); - PageResponse pageResponse = corpInfoRepository.listPage(parmas); + PageResponse pageResponse = corpInfoRepository.corpUserMiddlePage(parmas); List examCenterCOS = corpInfoCoConvertor.converDOsToMiddleCOs(pageResponse.getData()); examCenterCOS.forEach(info->{ info.setDepartMentCount(departmentRepository.getCountByCorpInfoId(info.getId())); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 1c3b042..633abaa 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -141,9 +141,6 @@ public class UserQueryExe { params.put("userIdList", Arrays.asList(ids)); } List userDOList = userRepository.listAll(params); - //手机号脱敏 - //身份照脱敏 - userDOList.forEach(userDO -> desensitize(userCoConvertor.converDOToCO(userDO))); List userExcelExportEntities = userCoConvertor.converDOsToExcelEntitys(userDOList); UserE userE = new UserE(); userE.exportUserTable(httpServletResponse, userExcelExportEntities); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java index 8f67bc5..fe58eff 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * web-client @@ -35,6 +37,8 @@ public class CorpDepartmentQry extends PageQuery { @ApiModelProperty(value = "是否启用,1:启用,0:关闭", name = "eqUseFlag") private String eqUseFlag; + @ApiModelProperty(value = "企业类型1:监管 2:企业 3:相关方", name = "enterpriseType", required = true) + private Integer enterpriseType; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java index 14123e0..090cc6e 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java @@ -51,10 +51,11 @@ public class CorpDepartmentE extends ClientObject { public void addDepart(List list) { - //过滤掉为null的 + //过滤掉为DepartmentE::getLevel为null的 Map levelToDepartmentMap = list.stream() .filter(Objects::nonNull) + .filter(departmentE -> departmentE.getLevel() != null) .collect(Collectors.groupingBy( DepartmentE::getLevel, Collectors.collectingAndThen( @@ -62,6 +63,7 @@ public class CorpDepartmentE extends ClientObject { Long::intValue // 直接将 Long 转为 Integer ) )); + // 部门级别待定 this.factoryCount =levelToDepartmentMap.get("departmentLevel0001"); this.sectionCount =levelToDepartmentMap.get("departmentLevel0002"); 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 3bed954..700a6c6 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 @@ -30,5 +30,6 @@ public interface CorpInfoRepository extends BaseRepository { Long checkCorpName(Map parmas); + PageResponse corpUserMiddlePage(Map parmas); } 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 d9c734a..5ec1ac6 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 @@ -169,6 +169,22 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl corpUserMiddlePage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + if(ObjectUtil.isNotNull(params.get("enterpriseType"))){ + List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + if(CollUtil.isNotEmpty(enterpriseType)){ + queryWrapper.in("type",enterpriseType ); + } + }else{ + queryWrapper.in("type", CorpTypeEnum.OrdinaryEnterprises.getCode(), CorpTypeEnum.groupUnits.getCode()); + } + queryWrapper.orderByAsc("corp_order").orderByDesc("create_time"); + IPage result = corpInfoMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } }