From 44f604ff575e41aa0e32677b5fdeefc1325d109a Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Mon, 10 Nov 2025 10:31:02 +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=E5=8F=98=E6=9B=B4=E6=B7=BB=E5=8A=A0=E5=8D=B0=E7=AB=A0?= =?UTF-8?q?=E5=92=8C=E6=88=90=E6=9C=AC=E9=A2=84=E7=AE=97-=E6=80=BB?= =?UTF-8?q?=E4=BD=93=E8=AE=A1=E5=88=92=E6=88=90=E6=9C=AC=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bo/XzdCsContractChangeBo.java | 6 +++ .../domain/vo/XzdCsContractChangeVo.java | 6 +++ .../impl/XzdCsContractChangeServiceImpl.java | 40 +++++++++++++++++++ .../domain/XzdCbysZjhcbAlteration.java | 9 +++++ .../domain/bo/XzdCbysZjhcbAlterationBo.java | 8 ++++ .../domain/vo/XzdCbysZjhcbAlterationVo.java | 8 ++++ 6 files changed, 77 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java index 90642369..cfd707d9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java @@ -17,6 +17,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; 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; import org.dromara.xzd.domain.XzdSettlementRules; @@ -247,5 +248,10 @@ public class XzdCsContractChangeBo 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/XzdCsContractChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java index 13a0724b..6c7c3205 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java @@ -15,6 +15,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; 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; import org.dromara.xzd.domain.XzdSettlementRules; @@ -306,5 +307,10 @@ public class XzdCsContractChangeVo 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 8d2a3bdd..6ae33354 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 @@ -26,9 +26,13 @@ import org.dromara.xzd.comprehensive.mapper.XzdCsContractChangeMapper; import org.dromara.xzd.comprehensive.service.IXzdCsContractChangeService; import org.dromara.xzd.comprehensive.service.IXzdCsContractSuspendZfkxService; import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService; +import org.dromara.xzd.domain.XzdBusinessChange; import org.dromara.xzd.domain.XzdContractClause; import org.dromara.xzd.domain.XzdDeductionItems; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.enums.XzdClassEnum; +import org.dromara.xzd.service.impl.XzdBusinessChangeServiceImpl; +import org.dromara.xzd.service.impl.XzdBusinessSealServiceImpl; import org.dromara.xzd.service.impl.XzdContractClauseServiceImpl; import org.dromara.xzd.service.impl.XzdDeductionItemsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -64,6 +68,10 @@ public class XzdCsContractChangeServiceImpl 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()); + } + xzdBusinessChangeService.saveBatch(bo.getSealInfo()); + } return flag; } @@ -245,6 +261,8 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl().eq(XzdBusinessChange::getContractChangeId, old.getId())); + String tableName = XzdClassEnum.CS_CONTRACT_CHANGE.getClassName(); if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) { throw new ServiceException("扣款与奖励项不能为空"); @@ -273,6 +291,11 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId())); if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) { @@ -331,6 +354,10 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl lambdaQueryWrapper3 = new LambdaQueryWrapper<>(); lambdaQueryWrapper3.in(XzdCsContractSuspendZfkx::getContractInformationId, ids); contractSuspendZfkxService.remove(lambdaQueryWrapper3); + + //印章信息 + xzdBusinessChangeService.remove(new LambdaQueryWrapper().in(XzdBusinessChange::getContractChangeId, ids)); + //合同变更清单 xzdHtglHtbgqdService.remove(new LambdaQueryWrapper().in(XzdHtglHtbgqd::getMainDocumentId,ids)); return baseMapper.deleteByIds(ids) > 0; @@ -362,6 +389,19 @@ 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); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java index 8ddf9bd0..5ca6c34c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java @@ -160,4 +160,13 @@ public class XzdCbysZjhcbAlteration extends BaseEntity { */ private String auditStatus; + /** + * 变更金额 + */ + private BigDecimal alterationAmount; + /** + * 变更率 + */ + private BigDecimal alterationTaxRate; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java index 5086237f..69b0a9ba 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java @@ -159,6 +159,14 @@ public class XzdCbysZjhcbAlterationBo extends BaseEntity { */ private String fileId; + /** + * 变更金额 + */ + private BigDecimal alterationAmount; + /** + * 变更率 + */ + private BigDecimal alterationTaxRate; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java index a1dac434..6d1dc483 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java @@ -152,6 +152,14 @@ public class XzdCbysZjhcbAlterationVo implements Serializable { */ @ExcelProperty(value = "利润金额") private BigDecimal profitAmount; + /** + * 变更金额 + */ + private BigDecimal alterationAmount; + /** + * 变更率 + */ + private BigDecimal alterationTaxRate; /** * 变更理由