From b905320413a5340dfc92519664b4404a79eca7fc Mon Sep 17 00:00:00 2001 From: lg Date: Mon, 10 Nov 2025 17:37:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E5=8C=85=E5=90=88=E5=90=8C=EF=BC=8Cjob=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/job/xzd/BaohanJob.java | 72 +++++++++++++++++++ .../bo/XzdPurchaseContractAlterationBo.java | 6 ++ .../vo/XzdPurchaseContractAlterationVo.java | 5 ++ ...PurchaseContractAlterationServiceImpl.java | 41 +++++++++++ .../domain/bo/XzdSubcontractChangeBo.java | 7 ++ .../domain/vo/XzdSubcontractChangeVo.java | 5 ++ .../impl/XzdSubcontractChangeServiceImpl.java | 47 ++++++++++-- .../domain/bo/XzdSubcontractBo.java | 5 ++ .../domain/vo/XzdSubcontractVo.java | 5 ++ .../impl/XzdSubcontractServiceImpl.java | 42 ++++++++++- .../bo/XzdPurchaseContractInformationBo.java | 7 ++ .../vo/XzdPurchaseContractInformationVo.java | 4 ++ ...urchaseContractInformationServiceImpl.java | 43 +++++++++++ 13 files changed, 283 insertions(+), 6 deletions(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/xzd/BaohanJob.java diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/xzd/BaohanJob.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/xzd/BaohanJob.java new file mode 100644 index 00000000..980c246d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/xzd/BaohanJob.java @@ -0,0 +1,72 @@ +package org.dromara.job.xzd; + + + +import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.sse.dto.SseMessageDto; +import org.dromara.common.sse.utils.SseMessageUtils; +import org.dromara.xzd.deposit.contractBackletter.domain.XzdGuaranteeInfo; +import org.dromara.xzd.deposit.contractBackletter.mapper.XzdGuaranteeInfoMapper; +import org.dromara.xzd.deposit.earnestMoney.domain.XzdDepositApplication; +import org.dromara.xzd.deposit.earnestMoney.domain.bo.XzdDepositApplicationBo; +import org.dromara.xzd.deposit.earnestMoney.mapper.XzdDepositApplicationMapper; +import org.dromara.xzd.deposit.earnestMoney.service.IXzdDepositApplicationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.util.List; +import java.util.stream.Collectors; + + +@Slf4j +@Component +@RequiredArgsConstructor +public class BaohanJob { + + + @Autowired + private XzdDepositApplicationMapper xzdDepositApplicationMapper; + + + private final XzdGuaranteeInfoMapper xzdGuaranteeInfoMapper; + + + + // @JobExecutor(name = "clockInMiss") + @Scheduled(cron = "0 0 8 1/1 * ?") + public void baozhengjinJob() { + log.info("保证金缴纳审批日期到期定时任务开始执行"); +// 查询保证金当天到期的数据 + List xzdDepositApplications = xzdDepositApplicationMapper.selectList(new LambdaQueryWrapper().eq(XzdDepositApplication::getDepositDueDate, LocalDate.now())); +//组装发送数据 + for (XzdDepositApplication xzdDepositApplication : xzdDepositApplications) { + SseMessageDto sseMessageDto = new SseMessageDto(); + sseMessageDto.setUserIds(List.of(xzdDepositApplication.getCreateBy())); + sseMessageDto.setMessage(xzdDepositApplication.getDocumentSerialNumber()+" "+"保证金日期到期"); + SseMessageUtils.publishMessage(sseMessageDto); + } + log.info("保证金缴纳审批日期到期定时任务执行成功"); + } + @Scheduled(cron = "0 0 8 1/1 * ?") + public void chengbaohetongbaohanJob() { + log.info("承包合同保函日期到期定时任务开始执行"); +// 查询保证金当天到期的数据 + List xzdGuaranteeInfos = xzdGuaranteeInfoMapper.selectList(new LambdaQueryWrapper().eq(XzdGuaranteeInfo::getDueDate, LocalDate.now())); +//组装发送数据 + for (XzdGuaranteeInfo xzdGuaranteeInfo : xzdGuaranteeInfos) { + SseMessageDto sseMessageDto = new SseMessageDto(); + sseMessageDto.setUserIds(List.of(xzdGuaranteeInfo.getCreateBy())); + sseMessageDto.setMessage(xzdGuaranteeInfo.getDocumentNumber()+" "+"保函日期到期"); + SseMessageUtils.publishMessage(sseMessageDto); + } + } + + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/bo/XzdPurchaseContractAlterationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/bo/XzdPurchaseContractAlterationBo.java index 757b6752..94f964a5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/bo/XzdPurchaseContractAlterationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/bo/XzdPurchaseContractAlterationBo.java @@ -10,6 +10,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.xzd.domain.XzdBusinessChange; import org.dromara.xzd.domain.XzdContractAdvanceInfo; import org.dromara.xzd.domain.XzdContractClause; import org.dromara.xzd.domain.XzdDeductionItems; @@ -255,4 +256,9 @@ public class XzdPurchaseContractAlterationBo extends BaseEntity { */ private List htghthzsjs; + /** + * 印章信息 + */ + private List sealInfo; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java index 008aa451..1e808e99 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java @@ -377,5 +377,10 @@ public class XzdPurchaseContractAlterationVo implements Serializable { */ private List htghthzsjs; + /** + * 印章信息 + */ + private List sealInfo; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java index d2b1bf36..f08f73d5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java @@ -25,6 +25,7 @@ import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurcha import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.dto.QuerCorrespondentDto; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.enums.XzdClassEnum; import org.dromara.xzd.service.IXzdContractAdvanceInfoService; import org.dromara.xzd.service.IXzdContractClauseService; @@ -86,6 +87,12 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl xzdBusinessChangeWrapper = new LambdaQueryWrapper<>(); + xzdBusinessChangeWrapper.eq(XzdBusinessChange::getContractChangeId, item.getId()); + List xzdBusinessChanges = xzdBusinessChangeService.list(xzdBusinessChangeWrapper); + for (XzdBusinessChange businessChange : xzdBusinessChanges) { + XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId()); + if (sealVo != null){ + businessChange.setSealName(sealVo.getYzName()); + } + } + item.setSealInfo(xzdBusinessChanges); + // 合同编码 if (item.getContractInformationId() != null){ @@ -273,6 +292,15 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl{item.setMainDocumentId(add.getId());}); @@ -335,6 +363,16 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl().eq(XzdBusinessChange::getContractChangeId, add.getId())); + + + for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) { + xzdBusinessChange.setContractChangeId(add.getId()); + xzdBusinessChange.setType("8"); + } + xzdBusinessChangeService.saveBatch(bo.getSealInfo()); //合同变更清单 xzdHtglHtbgqdService.remove(new LambdaQueryWrapper().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId())); if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) { @@ -378,6 +416,9 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl().in(XzdBusinessChange::getContractChangeId, ids)); //合同文本-预收款项 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java index 1565af3e..523cfa0e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java @@ -9,6 +9,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.xzd.domain.XzdBusinessChange; import org.dromara.xzd.domain.XzdContractAdvanceInfo; import org.dromara.xzd.domain.XzdContractClause; import org.dromara.xzd.domain.XzdDeductionItems; @@ -256,5 +257,11 @@ public class XzdSubcontractChangeBo extends BaseEntity { private List htbgqds; + /** + * 印章信息 + */ + private List sealInfo; + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java index d55542cf..663853d7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java @@ -374,6 +374,11 @@ public class XzdSubcontractChangeVo implements Serializable { */ private List htbgqds; + /** + * 印章信息 + */ + private List sealInfo; + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java index c99ca7ac..f4bceff7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java @@ -25,14 +25,12 @@ import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcont import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService; import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; import org.dromara.xzd.domain.*; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.enums.XzdClassEnum; import org.dromara.xzd.service.IXzdContractAdvanceInfoService; import org.dromara.xzd.service.IXzdContractClauseService; import org.dromara.xzd.service.IXzdDeductionItemsService; -import org.dromara.xzd.service.impl.XzdContractAdvanceInfoServiceImpl; -import org.dromara.xzd.service.impl.XzdContractClauseServiceImpl; -import org.dromara.xzd.service.impl.XzdDeductionItemsServiceImpl; -import org.dromara.xzd.service.impl.XzdSettlementRulesServiceImpl; +import org.dromara.xzd.service.impl.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; @@ -79,6 +77,12 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl lists) { for (XzdSubcontractChangeVo item : lists) { - + //印章信息 + LambdaQueryWrapper xzdBusinessChangeWrapper = new LambdaQueryWrapper<>(); + xzdBusinessChangeWrapper.eq(XzdBusinessChange::getContractChangeId, item.getId()); + List xzdBusinessChanges = xzdBusinessChangeService.list(xzdBusinessChangeWrapper); + for (XzdBusinessChange businessChange : xzdBusinessChanges) { + XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId()); + if (sealVo != null){ + businessChange.setSealName(sealVo.getYzName()); + } + } + item.setSealInfo(xzdBusinessChanges); // 合同编号名称 @@ -264,6 +278,15 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl{item.setMainDocumentId(add.getId());}); @@ -327,6 +350,15 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl().eq(XzdBusinessChange::getContractChangeId, add.getId())); + + + for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) { + xzdBusinessChange.setContractChangeId(add.getId()); + xzdBusinessChange.setType("5"); + } + xzdBusinessChangeService.saveBatch(bo.getSealInfo()); //合同变更清单 xzdHtglHtbgqdService.remove(new LambdaQueryWrapper().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId())); if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) { @@ -371,6 +403,11 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl().in(XzdBusinessChange::getContractChangeId, ids)); + //合同文本-预收款项 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java index 4971d4f2..18456e2d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java @@ -313,4 +313,9 @@ public class XzdSubcontractBo extends BaseEntity { private List htbgqds; + /** + * 印章信息 + */ + private List sealInfo; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java index 92be39ab..25951238 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java @@ -477,4 +477,9 @@ public class XzdSubcontractVo implements Serializable { */ private List htbgqds; + + /** + * 印章信息 + */ + private List sealInfo; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java index 31b13538..86d46896 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java @@ -30,6 +30,7 @@ import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseC import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.dto.QuerCorrespondentDto; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.enums.XzdClassEnum; import org.dromara.xzd.enums.ZxdEnum; import org.dromara.xzd.service.IXzdContractAdvanceInfoService; @@ -103,7 +104,13 @@ public class XzdSubcontractServiceImpl extends ServiceImpl infos) { for (XzdSubcontractVo item : infos) { + //印章信息 + LambdaQueryWrapper xzdBusinessChangeWrapper = new LambdaQueryWrapper<>(); + xzdBusinessChangeWrapper.eq(XzdBusinessChange::getContractChangeId, item.getId()); + List xzdBusinessChanges = xzdBusinessChangeService.list(xzdBusinessChangeWrapper); + for (XzdBusinessChange businessChange : xzdBusinessChanges) { + XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId()); + if (sealVo != null){ + businessChange.setSealName(sealVo.getYzName()); + } + } + item.setSealInfo(xzdBusinessChanges); // //合同文本-预收款项 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId()); @@ -311,6 +329,15 @@ public class XzdSubcontractServiceImpl extends ServiceImpl{item.setMainDocumentId(add.getId());}); @@ -374,6 +401,16 @@ public class XzdSubcontractServiceImpl extends ServiceImpl().eq(XzdBusinessChange::getContractChangeId, update.getId())); + + + for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) { + xzdBusinessChange.setContractChangeId(update.getId()); + xzdBusinessChange.setType("4"); + } + xzdBusinessChangeService.saveBatch(bo.getSealInfo()); // 支付条款 List zftk = bo.getZftk(); xzdSettlementRulesService.getBaseMapper().deleteByMap(hashMap); @@ -429,6 +466,9 @@ public class XzdSubcontractServiceImpl extends ServiceImpl().in(XzdBusinessChange::getContractChangeId, ids)); //合同文本-预收款项 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java index cef4a412..b2d8dd10 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java @@ -337,4 +337,11 @@ public class XzdPurchaseContractInformationBo extends BaseEntity { */ private List htghthzsjs; + + /** + * 印章信息 + */ + private List sealInfo; + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java index 95ee0e84..90db33d0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java @@ -511,6 +511,10 @@ public class XzdPurchaseContractInformationVo implements Serializable { */ private List htghthzsjs; + /** + * 印章信息 + */ + private List sealInfo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java index e184a955..b7efeca1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java @@ -44,6 +44,7 @@ import org.dromara.xzd.contractManagement.purchaseManagement.mapper.XzdPurchaseC import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.dto.QuerCorrespondentDto; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdProjectVo; import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; @@ -113,6 +114,12 @@ public class XzdPurchaseContractInformationServiceImpl 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("7"); + } + xzdBusinessChangeService.saveBatch(bo.getSealInfo()); + } //汇总数据 if (bo.getHtghthzsjs() != null && !bo.getHtghthzsjs().isEmpty()) { bo.getHtghthzsjs().forEach(item->{item.setMainDocumentId(add.getId());}); @@ -344,6 +360,17 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl().eq(XzdBusinessChange::getContractChangeId, update.getId())); + + + for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) { + xzdBusinessChange.setContractChangeId(update.getId()); + xzdBusinessChange.setType("7"); + } + xzdBusinessChangeService.saveBatch(bo.getSealInfo()); + //合同变更清单 xzdHtglHtbgqdService.remove(new LambdaQueryWrapper().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId())); if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) { @@ -390,6 +417,10 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl().in(XzdBusinessChange::getContractChangeId, ids)); //合同文本-预收款项 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids); @@ -439,6 +470,18 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl infos){ for (XzdPurchaseContractInformationVo item : infos) { + + //印章信息 + LambdaQueryWrapper xzdBusinessChangeWrapper = new LambdaQueryWrapper<>(); + xzdBusinessChangeWrapper.eq(XzdBusinessChange::getContractChangeId, item.getId()); + List xzdBusinessChanges = xzdBusinessChangeService.list(xzdBusinessChangeWrapper); + for (XzdBusinessChange businessChange : xzdBusinessChanges) { + XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId()); + if (sealVo != null){ + businessChange.setSealName(sealVo.getYzName()); + } + } + item.setSealInfo(xzdBusinessChanges); //合同文本-预收款项 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());