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

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java

@@ -50,6 +50,8 @@ public class ListUnitReq extends PageReqV2 {
     private Set<Long> identityIds;
     @CriteriaField(field = "legalIdCard", operator = Operator.IN)
     private Set<String> legalIdCards;
+    @CriteriaField(field = "identityType", operator = Operator.EQ)
+    private Integer identityType;
     /**
      * TODO: 待实现
      * 查询返回数据包含，逻辑删除数据，即查询未删除和已删除的数据。

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroup.java

@@ -9,9 +9,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
  * @description 岗位分组表
@@ -20,7 +21,8 @@ import lombok.NoArgsConstructor;
  * @date 2024/9/9
  */
 @Data
-@Builder
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName(value = "org_job_group", autoResultMap = true)

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroupRelation.java

@@ -4,11 +4,13 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
 import java.util.Date;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
  * @description 岗位与分组的关系表
@@ -17,11 +19,12 @@ import lombok.NoArgsConstructor;
  * @date 2024/9/9
  */
 @Data
-@Builder
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName(value = "org_job_group_relation", autoResultMap = true)
-public class OrgJobGroupRelation {
+public class OrgJobGroupRelation implements Serializable {
 
     /**
      * 主键

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroupRelationHistory.java

@@ -9,9 +9,10 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import java.util.Date;
 import java.util.List;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
  * @description 岗位与分组的关系历史表
@@ -20,7 +21,8 @@ import lombok.NoArgsConstructor;
  * @date 2024/9/9
  */
 @Data
-@Builder
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName(value = "org_job_group_relation_history", autoResultMap = true)

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobHistory.java

@@ -10,9 +10,10 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
  * @description 岗位变更历史表
@@ -21,7 +22,8 @@ import lombok.NoArgsConstructor;
  * @date 2024/9/9
  */
 @Data
-@Builder
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName(value = "org_job_history", autoResultMap = true)

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobGroupRelationRepository.java

@@ -29,15 +29,17 @@ public interface OrgJobGroupRelationRepository {
         /**
          * 分组id集合
          */
-        @CriteriaField(field = "id", operator = Operator.IN)
+        @CriteriaField(ignore = true)
         private Collection<Long> groupIds;
         /**
          * 岗位分组编码集合
          */
+        @CriteriaField(field = "group_code", operator = Operator.IN)
         private Collection<String> groupCodes;
         /**
          * 岗位编码集合
          */
+        @CriteriaField(field = "job_code", operator = Operator.IN)
         private Collection<String> jobCodes;
 
         public boolean isInvalid() {

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobGroupRelationRepositoryImpl.java

@@ -1,14 +1,11 @@
 package cn.axzo.orgmanax.infra.dao.orgjob.repository.impl;
 
 import cn.axzo.foundation.dao.support.converter.PageConverter;
-import cn.axzo.foundation.dao.support.mysql.QueryWrapperHelper;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.orgmanax.infra.dao.orgjob.dao.OrgJobGroupRelationDao;
 import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJobGroupRelation;
 import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobGroupRelationRepository;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -26,9 +23,11 @@ public class OrgJobGroupRelationRepositoryImpl implements OrgJobGroupRelationRep
     @Override
     public PageResp<OrgJobGroupRelation> page(PageReq req) {
         IPage<OrgJobGroupRelation> page = PageConverter.toMybatis(req, OrgJobGroupRelation.class);
-        QueryWrapper<OrgJobGroupRelation> wrapper = QueryWrapperHelper.fromBean(req, OrgJobGroupRelation.class);
+        IPage<OrgJobGroupRelation> results = orgJobGroupRelationDao.lambdaQuery()
-        IPage<OrgJobGroupRelation> results = orgJobGroupRelationDao.page(page, wrapper)
+            .in(CollUtil.isNotEmpty(req.getGroupCodes()), OrgJobGroupRelation::getGroupCode, req.getGroupCodes())
-            .convert(e -> BeanUtil.toBean(e, OrgJobGroupRelation.class));
+            .in(CollUtil.isNotEmpty(req.getJobCodes()), OrgJobGroupRelation::getJobCode, req.getJobCodes())
+            .eq(OrgJobGroupRelation::getIsDelete, 0L)
+            .page(page);
         PageResp<OrgJobGroupRelation> resp = PageConverter.toResp(results);
         List<OrgJobGroupRelation> records = resp.getData();
         if (CollUtil.isEmpty(records)) {

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobGroupRepositoryImpl.java

@@ -1,14 +1,11 @@
 package cn.axzo.orgmanax.infra.dao.orgjob.repository.impl;
 
 import cn.axzo.foundation.dao.support.converter.PageConverter;
-import cn.axzo.foundation.dao.support.mysql.QueryWrapperHelper;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.orgmanax.infra.dao.orgjob.dao.OrgJobGroupDao;
 import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJobGroup;
 import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobGroupRepository;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -27,9 +24,12 @@ public class OrgJobGroupRepositoryImpl implements OrgJobGroupRepository {
     @Override
     public PageResp<OrgJobGroup> page(PageReq req) {
         IPage<OrgJobGroup> page = PageConverter.toMybatis(req, OrgJobGroup.class);
-        QueryWrapper<OrgJobGroup> wrapper = QueryWrapperHelper.fromBean(req, OrgJobGroup.class);
+        IPage<OrgJobGroup> results = orgJobGroupDao.lambdaQuery()
-        IPage<OrgJobGroup> results = orgJobGroupDao.page(page, wrapper)
+            .in(CollUtil.isNotEmpty(req.getOrgJobGroupFlags()), OrgJobGroup::getFlag, req.getOrgJobGroupFlags())
-            .convert(e -> BeanUtil.toBean(e, OrgJobGroup.class));
+            .in(CollUtil.isNotEmpty(req.getGroupCodes()), OrgJobGroup::getCode, req.getGroupCodes())
+            .in(CollUtil.isNotEmpty(req.getGroupIds()), OrgJobGroup::getId, req.getGroupIds())
+            .eq(OrgJobGroup::getIsDelete, 0L)
+            .page(page);
         PageResp<OrgJobGroup> resp = PageConverter.toResp(results);
         List<OrgJobGroup> records = resp.getData();
         if (CollUtil.isEmpty(records)) {

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

@@ -108,6 +108,8 @@ public interface UnitQueryRepository {
         private Set<Long> identityIds;
         @CriteriaField(field = "legalIdCard", operator = Operator.IN)
         private Set<String> legalIdCards;
+        @CriteriaField(field = "identityType", operator = Operator.EQ)
+        private Integer identityType;
     }
 
     @EqualsAndHashCode(callSuper = true)