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

Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282

Browse Source
This commit is contained in:
liuyang 2024-12-23 14:15:03 +08:00
commit 6163706230
8 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
orgmanax-api/src/main/java/cn/axzo/orgmanax/api/node/req/ListNodeReq.java
View File

@ -1,18 +1,17 @@
package cn.axzo.orgmanax.api.node.req; package cn.axzo.orgmanax.api.node.req;
import cn.axzo.foundation.page.IPageReq; import cn.axzo.foundation.page.PageReqV2;
import lombok.AllArgsConstructor; import lombok.*;
import lombok.Builder; import lombok.experimental.SuperBuilder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Set; import java.util.Set;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Data @Data
@Builder @SuperBuilder
public class ListNodeReq implements IPageReq { public class ListNodeReq extends PageReqV2 {
/** /**
* 页数 * 页数
*/ */

13
orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/req/ListNodeUserReq.java
View File

@ -2,20 +2,19 @@ package cn.axzo.orgmanax.api.nodeuser.req;
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 lombok.AllArgsConstructor; import lombok.*;
import lombok.Builder; import lombok.experimental.SuperBuilder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Data @Data
@Builder @SuperBuilder
public class ListNodeUserReq implements IPageReq { public class ListNodeUserReq extends PageReqV2 {
@CriteriaField @CriteriaField
private Long id; private Long id;

14
orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/ListOrgJobReq.java
View File

@ -1,17 +1,15 @@
package cn.axzo.orgmanax.api.orgjob.req; package cn.axzo.orgmanax.api.orgjob.req;
import cn.axzo.foundation.page.IPageReq; import cn.axzo.foundation.page.PageReqV2;
import com.alibaba.fastjson.JSONObject; import lombok.*;
import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Data @Data
@Builder @SuperBuilder
public class ListOrgJobReq implements IPageReq { public class ListOrgJobReq extends PageReqV2 {
/** /**
* 名称 * 名称

15
orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java
View File

@ -2,21 +2,20 @@ package cn.axzo.orgmanax.api.orgjob.req;
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.orgmanax.api.orgjob.enums.OrgJobGroupFlagEnum; import cn.axzo.orgmanax.api.orgjob.enums.OrgJobGroupFlagEnum;
import java.util.List; import lombok.*;
import java.util.Set;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.util.List;
import java.util.Set;
@EqualsAndHashCode(callSuper = true)
@Data @Data
@SuperBuilder @SuperBuilder
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class PageOrgJobReq implements IPageReq { public class PageOrgJobReq extends PageReqV2 {
/** /**
* 岗位ids * 岗位ids
*/ */

10
orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/req/ListOrgUserReq.java
View File

@ -2,21 +2,19 @@ package cn.axzo.orgmanax.api.orguser.req;
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 lombok.AllArgsConstructor; import lombok.*;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Data @Data
@SuperBuilder @SuperBuilder
public class ListOrgUserReq implements IPageReq { public class ListOrgUserReq extends PageReqV2 {
@CriteriaField @CriteriaField
private Long id; private Long id;
@CriteriaField(field = "id", operator = Operator.IN) @CriteriaField(field = "id", operator = Operator.IN)

7
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java
View File

@ -1,12 +1,12 @@
package cn.axzo.orgmanax.infra.dao.orgjob.repository; package cn.axzo.orgmanax.infra.dao.orgjob.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.page.PageReqV2;
import cn.axzo.foundation.page.IPageReq;
import cn.axzo.foundation.page.PageResp; import cn.axzo.foundation.page.PageResp;
import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJob; import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJob;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@ -15,11 +15,12 @@ public interface OrgJobQueryRepository {
PageResp<OrgJob> page(ListReq req); PageResp<OrgJob> page(ListReq req);
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Data @Data
@SuperBuilder @SuperBuilder
class ListReq implements IPageReq { class ListReq extends PageReqV2 {
@CriteriaField @CriteriaField
private String name; private String name;

4
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitContactQueryRepository.java
View File

@ -3,6 +3,7 @@ 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.IPageReq;
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.OrganizationalContact; import cn.axzo.orgmanax.infra.dao.unit.entity.OrganizationalContact;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
@ -26,11 +27,12 @@ public interface UnitContactQueryRepository {
return page(pageReq).getData(); return page(pageReq).getData();
} }
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Data @Data
@SuperBuilder @SuperBuilder
class ListReq implements IPageReq { class ListReq extends PageReqV2 {
@CriteriaField @CriteriaField
private Long id; private Long id;
@CriteriaField(field = "id", operator = Operator.IN) @CriteriaField(field = "id", operator = Operator.IN)

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

@ -1,15 +1,12 @@
package cn.axzo.orgmanax.infra.dao.unit.repository; package cn.axzo.orgmanax.infra.dao.unit.repository;
import cn.axzo.foundation.dao.support.mysql.QueryWrapperHelper;
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.IPageReq;
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;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.base.Preconditions;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -74,11 +71,12 @@ public interface UnitQueryRepository {
} }
} }
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Data @Data
@SuperBuilder @SuperBuilder
class ListReq implements IPageReq{ class ListReq extends PageReqV2 {
@CriteriaField @CriteriaField
private Long id; private Long id;
@CriteriaField(field = "id", operator = Operator.IN) @CriteriaField(field = "id", operator = Operator.IN)