From 750d6cb7aafb4302e3c77b22d37fa520269c8ef9 Mon Sep 17 00:00:00 2001 From: zhouxiaofeng <2946471396@qq.com> Date: Thu, 4 Jun 2026 09:45:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nbport/zgwl/partner/dto/PartnerQueryDto.java | 3 +++ .../zgwl/partner/service/PartnerManageServiceImpl.java | 5 +++-- src/main/resources/mapper/partner/PartnerManageMapper.xml | 4 ++-- zgwl_manifest_tables_oracle.sql | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nbport/zgwl/partner/dto/PartnerQueryDto.java b/src/main/java/com/nbport/zgwl/partner/dto/PartnerQueryDto.java index 71b3e15..5d9917b 100644 --- a/src/main/java/com/nbport/zgwl/partner/dto/PartnerQueryDto.java +++ b/src/main/java/com/nbport/zgwl/partner/dto/PartnerQueryDto.java @@ -31,4 +31,7 @@ public class PartnerQueryDto extends BasePageDto implements Serializable { /** 同步状态（unsynced/synced/failed） */ private String syncStatus; + + /** 组织ID */ + private Long orgId; } diff --git a/src/main/java/com/nbport/zgwl/partner/service/PartnerManageServiceImpl.java b/src/main/java/com/nbport/zgwl/partner/service/PartnerManageServiceImpl.java index ac60574..78408ca 100644 --- a/src/main/java/com/nbport/zgwl/partner/service/PartnerManageServiceImpl.java +++ b/src/main/java/com/nbport/zgwl/partner/service/PartnerManageServiceImpl.java @@ -39,6 +39,7 @@ public class PartnerManageServiceImpl implements PartnerManageService { @Override public PageResult queryPartnerList(PartnerQueryDto queryDto) { Page page = new Page<>(queryDto.getPageNo(), queryDto.getPageSize()); + queryDto.setOrgId(1L); Page resultPage = (Page) partnerManageMapper.selectPartnerPage(page, queryDto); PageResult pageResult = new PageResult<>(resultPage); attachContacts(pageResult.getData()); @@ -75,9 +76,9 @@ public class PartnerManageServiceImpl implements PartnerManageService { partner.setCreateTime(now); partner.setUpdateBy(PartnerManageConstants.DEFAULT_OPERATOR); partner.setUpdateTime(now); + partner.setOrgId(1L); partner.setIsDeleted(PartnerManageConstants.PARTNER_IS_DELETED_NORMAL); - partnerManageMapper.insertPartner(partner); saveContacts(partner.getCustomerSysid(), partner.getContacts(), now); return partner.getCustomerSysid(); @@ -109,8 +110,8 @@ public class PartnerManageServiceImpl implements PartnerManageService { partner.setSyncMessage("信息已修改，待重新同步"); partner.setUpdateBy(PartnerManageConstants.DEFAULT_OPERATOR); partner.setUpdateTime(now); + partner.setOrgId(1L); partner.setIsDeleted(PartnerManageConstants.PARTNER_IS_DELETED_NORMAL); - partnerManageMapper.updatePartner(partner); partnerManageMapper.markPartnerContactsDeletedByPartnerId( partner.getCustomerSysid(), diff --git a/src/main/resources/mapper/partner/PartnerManageMapper.xml b/src/main/resources/mapper/partner/PartnerManageMapper.xml index 55c7038..1da342c 100644 --- a/src/main/resources/mapper/partner/PartnerManageMapper.xml +++ b/src/main/resources/mapper/partner/PartnerManageMapper.xml @@ -117,7 +117,7 @@ OPPOSITE_STATUS, IS_SGAT, IS_JTN, NATURE_OF_ENTERPRISE_ORG, NATURE_OF_ENTERPRISE_ORG_LEV, RELATIVE_TYPE, IS_DELETED, COMMENTS, REMARK, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, - sync_status, sync_time, sync_message + sync_status, sync_time, sync_message, ORG_ID ) values ( @@ -128,7 +128,7 @@ #{oppositeStatus}, #{isSgat}, #{isJtn}, #{natureOfEnterpriseOrg}, #{natureOfEnterpriseOrgLev}, #{relativeType}, #{isDeleted}, #{comments}, #{remark}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, - #{syncStatus}, #{syncTime}, #{syncMessage} + #{syncStatus}, #{syncTime}, #{syncMessage}, #{orgId} ) diff --git a/zgwl_manifest_tables_oracle.sql b/zgwl_manifest_tables_oracle.sql index 7f1fa08..bde3b5d 100644 --- a/zgwl_manifest_tables_oracle.sql +++ b/zgwl_manifest_tables_oracle.sql @@ -81,3 +81,5 @@ CREATE SEQUENCE SEQ_CONTRACT_TEMPLATE_MANAGE INCREMENT BY 1 NOCACHE NOCYCLE; + +CREATE SEQUENCE SEQ_CONTRACT_TEMPLATE_MANAGE INCREMENT BY 1 MINVALUE 1 MAXVALUE 9999999999999999999999999999 NOCYCLE CACHE 20 NOORDER