wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3282): 提供briefDTO，用于聚合 step2

Browse Source
This commit is contained in:
周敏 2024-12-25 17:04:46 +08:00
parent 864e8426e4
commit cc8e5ed212
3 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
orgmanax-api/src/test/resources/http/nodeuser/node-user.http
View File

@ -12,8 +12,9 @@ Accept: application/json
"includeDeleted": true, "includeDeleted": true,
"pageSize": 2, "pageSize": 2,
"needs": { "needs": {
"job": true, "job": true
"node": true, ,
"node": true ,
"unit": true "unit": true
} }
} }

11
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java
View File

@ -10,11 +10,12 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
@RequiredArgsConstructor @RequiredArgsConstructor
@Repository @Repository
public class OrgJobQueryRepositoryImpl implements OrgJobQueryRepository { public class OrgJobQueryRepositoryImpl implements OrgJobQueryRepository {
@ -28,14 +29,14 @@ public class OrgJobQueryRepositoryImpl implements OrgJobQueryRepository {
QueryWrapper<OrgJob> wrapper = QueryWrapperHelper.fromBean(req, OrgJob.class); QueryWrapper<OrgJob> wrapper = QueryWrapperHelper.fromBean(req, OrgJob.class);
if (StringUtils.isNotBlank(req.getKeyword())) { if (StringUtils.isNotBlank(req.getKeyword())) {
wrapper.and(wr -> wr.like("name", req.getKeyword()) wrapper.and(wr -> wr.like("name", req.getKeyword())
.or() .or()
.like("alias", req.getKeyword())); .like("alias", req.getKeyword()));
} }
if (wrapper.isEmptyOfWhere()) { if (wrapper.isEmptyOfWhere()) {
return PageResp.<JobResp>builder().build(); return PageResp.<JobResp>builder().build();
} }
IPage<OrgJob> results = orgJobDao.page(page, wrapper) IPage<JobResp> results = orgJobDao.page(page, wrapper)
.convert(e -> BeanUtil.toBean(e, OrgJob.class)); .convert(e -> BeanUtil.toBean(e, JobResp.class));
PageResp<JobResp> resp = PageConverter.toResp(results); PageResp<JobResp> resp = PageConverter.toResp(results);
List<JobResp> records = resp.getData(); List<JobResp> records = resp.getData();
if (CollUtil.isEmpty(records)) { if (CollUtil.isEmpty(records)) {

23
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java
View File

@ -2,7 +2,6 @@ package cn.axzo.orgmanax.infra.dao.unit.repository;
import cn.axzo.foundation.dao.support.wrapper.CriteriaField; import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
import cn.axzo.foundation.dao.support.wrapper.Operator; import cn.axzo.foundation.dao.support.wrapper.Operator;
import cn.axzo.foundation.page.IPageReq;
import cn.axzo.foundation.page.PageReqV2; import cn.axzo.foundation.page.PageReqV2;
import cn.axzo.foundation.page.PageResp; import cn.axzo.foundation.page.PageResp;
import cn.axzo.orgmanax.infra.dao.unit.entity.OrganizationalUnit; import cn.axzo.orgmanax.infra.dao.unit.entity.OrganizationalUnit;
@ -22,10 +21,8 @@ public interface UnitQueryRepository {
PageResp<UnitResp> page(ListReq paramReq); PageResp<UnitResp> page(ListReq paramReq);
default List<UnitResp> list(ListReq req) { default List<UnitResp> list(ListReq req) {
PageReq pageReq = BeanUtil.toBean(req, PageReq.class); req.setSearchCount(false);
pageReq.setPage(1); return page(req).getData();
pageReq.setPageSize(1000);
return page(pageReq).getData();
} }
default UnitResp one(OneReq req) { default UnitResp one(OneReq req) {
@ -34,7 +31,7 @@ public interface UnitQueryRepository {
default Optional<UnitResp> oneOpt(OneReq req) { default Optional<UnitResp> oneOpt(OneReq req) {
req.check(); req.check();
PageReq page = BeanUtil.toBean(req, PageReq.class); ListReq page = BeanUtil.toBean(req, ListReq.class);
page.setPage(1); page.setPage(1);
page.setPageSize(1); page.setPageSize(1);
return page(page).getData().stream().findFirst(); return page(page).getData().stream().findFirst();
@ -120,20 +117,6 @@ public interface UnitQueryRepository {
private Boolean includeDeleted; private Boolean includeDeleted;
} }
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Data
@SuperBuilder
class PageReq extends ListReq implements IPageReq {
@CriteriaField(ignore = true)
Integer page;
@CriteriaField(ignore = true)
Integer pageSize;
@CriteriaField(ignore = true)
List<String> sort;
}
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor