From 8d4059bbf45c8db9641e63b85f20135e57abcece Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Mon, 10 Nov 2025 17:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E5=92=8C=E5=8F=98=E6=9B=B4=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8D=B0=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bo/XzdCsContractInformationBo.java | 6 +++ .../domain/vo/XzdCsContractInformationVo.java | 7 +++ .../impl/XzdCsContractChangeServiceImpl.java | 2 + .../XzdCsContractInformationServiceImpl.java | 44 +++++++++++++++++++ .../dromara/xzd/domain/XzdBusinessChange.java | 2 +- 5 files changed, 60 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractInformationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractInformationBo.java index 67b3c19c..574811fc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractInformationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractInformationBo.java @@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.comprehensive.domain.XzdCsContractInformation; import org.dromara.xzd.comprehensive.domain.XzdCsContractSuspendZfkx; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; +import org.dromara.xzd.domain.XzdBusinessChange; import org.dromara.xzd.domain.XzdContractClause; import org.dromara.xzd.domain.XzdDeductionItems; @@ -293,5 +294,10 @@ public class XzdCsContractInformationBo extends BaseEntity { */ private List htbgqds; + /** + * 印章信息 + */ + private List sealInfo; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java index fc442ff6..86350153 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java @@ -11,6 +11,7 @@ import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.comprehensive.domain.XzdCsContractInformation; import org.dromara.xzd.comprehensive.domain.XzdCsContractSuspendZfkx; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; +import org.dromara.xzd.domain.XzdBusinessChange; import org.dromara.xzd.domain.XzdContractClause; import org.dromara.xzd.domain.XzdDeductionItems; @@ -359,5 +360,11 @@ public class XzdCsContractInformationVo implements Serializable { */ private List htbgqds; + /** + * 印章信息 + */ + private List sealInfo; + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java index 6ae33354..9b69516e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java @@ -222,6 +222,7 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl list4 = xzdHtglHtbgqdService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdHtglHtbgqd::getMainDocumentId, vo.getId())); vo.setHtbgqds(list4); + + //印章信息 + LambdaQueryWrapper lambdaQueryWrapper4 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper4.select(XzdBusinessChange::getBusinessId); + lambdaQueryWrapper4.eq(XzdBusinessChange::getContractChangeId, vo.getId()); + List list3 = xzdBusinessChangeService.list(lambdaQueryWrapper4); + for (XzdBusinessChange businessChange : list3) { + XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId()); + if (sealVo != null){ + businessChange.setSealName(sealVo.getYzName()); + } + } + vo.setSealInfo(list3); } /** @@ -235,6 +257,15 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl{item.setMainDocumentId(add.getId());}); xzdHtglHtbgqdService.saveBatch(bo.getHtbgqds()); } + + //印章信息 + if (bo.getSealInfo() != null && !bo.getSealInfo().isEmpty()){ + for (XzdBusinessChange sealInfo : bo.getSealInfo()) { + sealInfo.setContractChangeId(add.getId()); + sealInfo.setType("10"); + } + xzdBusinessChangeService.saveBatch(bo.getSealInfo()); + } return flag; } @@ -274,6 +305,9 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl lambdaQueryWrapper4 = new LambdaQueryWrapper<>(); lambdaQueryWrapper4.eq(XzdDeductionItems::getContractDetailsId, old.getId()); xzdDeductionItemsService.remove(lambdaQueryWrapper4); + //印章信息 + xzdBusinessChangeService.remove(new LambdaQueryWrapper().eq(XzdBusinessChange::getContractChangeId, old.getId())); + String tableName = XzdClassEnum.CS_CONTRACT_INFORMATION.getClassName(); if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) { @@ -309,6 +343,13 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl 0; } @@ -361,6 +402,9 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl().in(XzdHtglHtbgqd::getMainDocumentId,ids)); + //印章信息 + xzdBusinessChangeService.remove(new LambdaQueryWrapper().in(XzdBusinessChange::getContractChangeId, ids)); + return baseMapper.deleteByIds(ids) > 0; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdBusinessChange.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdBusinessChange.java index 432ffb06..037d4e99 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdBusinessChange.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdBusinessChange.java @@ -54,7 +54,7 @@ public class XzdBusinessChange extends BaseEntity { private String remark; /** - * 合同类型 + * 类型（4、分包合同信息,5、分包合同变更，7、采购合同信息，8、采购合同变更，10、综合服务合同信息，11、综合服务合同变更） */ private String type;