From 2a869292e334f3daad8baad45fd96fecac23a297 Mon Sep 17 00:00:00 2001 From: zhanghonghao Date: Tue, 24 Dec 2024 14:56:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3282):=20=E5=8D=95=E4=BD=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=94=AF=E6=8C=81=E6=8C=87=E5=AE=9A=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java | 2 ++ .../java/cn/axzo/orgmanax/dto/unit/req/UpdateUnitReq.java | 4 ++++ .../orgmanax/infra/dao/unit/entity/OrganizationalUnit.java | 2 ++ .../infra/dao/unit/repository/UnitQueryRepository.java | 2 ++ .../axzo/orgmanax/server/unit/service/dto/UpdateUnitReq.java | 5 ++++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java index 79998ac..3c0a3cf 100644 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java @@ -50,6 +50,8 @@ public class ListUnitReq extends PageReqV2 { private Set identityIds; @CriteriaField(field = "legalIdCard", operator = Operator.IN) private Set legalIdCards; + @CriteriaField(field = "legalPhone", operator = Operator.IN) + private Set legalPhones; @CriteriaField(field = "identityType", operator = Operator.EQ) private Integer identityType; /** diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/UpdateUnitReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/UpdateUnitReq.java index b69d72c..d4cc086 100644 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/UpdateUnitReq.java +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/UpdateUnitReq.java @@ -192,5 +192,9 @@ public class UpdateUnitReq implements Serializable { * 市名称 */ private String cityName; + /** + * 历史平台班组的同步数据，0：还未同步，1：同步完成 + */ + private Integer syncState; } diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalUnit.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalUnit.java index 58b98fd..9abec88 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalUnit.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalUnit.java @@ -1,5 +1,6 @@ package cn.axzo.orgmanax.infra.dao.unit.entity; +import cn.axzo.trade.datasecurity.core.annotation.CryptField; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -99,6 +100,7 @@ public class OrganizationalUnit implements Serializable { /** * 法人代表身份证 */ + @CryptField private String legalIdCard; /** diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java index bcf063a..d430daf 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java @@ -108,6 +108,8 @@ public interface UnitQueryRepository { private Set identityIds; @CriteriaField(field = "legalIdCard", operator = Operator.IN) private Set legalIdCards; + @CriteriaField(field = "legalPhone", operator = Operator.IN) + private Set legalPhones; @CriteriaField(field = "identityType", operator = Operator.EQ) private Integer identityType; } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/dto/UpdateUnitReq.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/dto/UpdateUnitReq.java index 45e75be..d825920 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/dto/UpdateUnitReq.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/dto/UpdateUnitReq.java @@ -190,5 +190,8 @@ public class UpdateUnitReq { * 市名称 */ private String cityName; - + /** + * 历史平台班组的同步数据，0：还未同步，1：同步完成 + */ + private Integer syncState; }