From c3ab46c8c8bba5f95f2455fa3bcec20970198c31 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Thu, 20 Nov 2025 19:27:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=99=8D=E4=BD=8Espringdoc=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xinnengyuan/pom.xml | 2 +- xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xinnengyuan/pom.xml b/xinnengyuan/pom.xml index 56b6c6d4..7022d665 100644 --- a/xinnengyuan/pom.xml +++ b/xinnengyuan/pom.xml @@ -18,7 +18,7 @@ UTF-8 21 3.5.16 - 2.8.4 + 2.3.0 0.15.0 4.0.3 2.3 diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml b/xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml index 2f0b5838..d40248a8 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml +++ b/xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml @@ -44,7 +44,17 @@ com.github.xiaoymin knife4j-openapi3-jakarta-spring-boot-starter - 4.4.0 + 4.5.0 + + + org.springdoc + springdoc-openapi-starter-webmvc-api + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + + From e26dfc098a82722a8bca93f4bb26474955a6ecfd Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 20 Nov 2025 19:47:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AB=A3=E5=B7=A5=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/XzdSettlementOfJixieContractVo.java | 2 +- .../domain/vo/XzdSettlementOfJixieCompletionVo.java | 6 ++++++ .../XzdSettlementOfJixieCompletionServiceImpl.java | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjiesuan/domain/vo/XzdSettlementOfJixieContractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjiesuan/domain/vo/XzdSettlementOfJixieContractVo.java index f2715593..bd4cc460 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjiesuan/domain/vo/XzdSettlementOfJixieContractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjiesuan/domain/vo/XzdSettlementOfJixieContractVo.java @@ -121,7 +121,7 @@ public class XzdSettlementOfJixieContractVo implements Serializable { * 结算单位 */ @ExcelProperty(value = "结算单位 ") - private BigDecimal settlementUnit; + private Long settlementUnit; /** * 结算单位 客户信息名称 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/domain/vo/XzdSettlementOfJixieCompletionVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/domain/vo/XzdSettlementOfJixieCompletionVo.java index cc7a1f4c..6b757018 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/domain/vo/XzdSettlementOfJixieCompletionVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/domain/vo/XzdSettlementOfJixieCompletionVo.java @@ -85,6 +85,12 @@ public class XzdSettlementOfJixieCompletionVo implements Serializable { @ExcelProperty(value = "审定总价") private BigDecimal approvedTotalPrice; + /** + * 竣工日期 + */ + @ExcelProperty(value = "竣工日期") + private LocalDate actualCompletionDate; + /** * 审定日期 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/service/impl/XzdSettlementOfJixieCompletionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/service/impl/XzdSettlementOfJixieCompletionServiceImpl.java index f0ff9c1d..60857966 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/service/impl/XzdSettlementOfJixieCompletionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/service/impl/XzdSettlementOfJixieCompletionServiceImpl.java @@ -17,11 +17,13 @@ import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService; import org.dromara.xzd.domain.XzdJsqdTz; +import org.dromara.xzd.domain.XzdProject; import org.dromara.xzd.domain.bo.XzdJsqdTzBo; import org.dromara.xzd.domain.vo.XzdJsqdTzVo; import org.dromara.xzd.enums.XzdClassEnum; import org.dromara.xzd.enums.ZxdEnum; import org.dromara.xzd.service.IXzdJsqdTzService; +import org.dromara.xzd.service.IXzdProjectService; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.bo.XzdJsDeductionItemsBo; import org.dromara.xzd.settlement.domain.vo.XzdJsDeductionItemsVo; @@ -63,6 +65,8 @@ public class XzdSettlementOfJixieCompletionServiceImpl extends ServiceImpl 0) { item.setJlykk(MapstructUtils.convert(xzdJsDeductionItems, XzdJsDeductionItemsVo.class)); } + // 竣工日期回填 + if(item.getEngineeringProject() != null){ + XzdProject byId = xzdProjectService.getById(item.getEngineeringProject()); + if(byId != null){ + item.setActualCompletionDate(byId.getActualCompletionDate()); + } + + } } }