Merge remote-tracking branch 'origin/dev' into dev

xinnengyuan/pom.xml

@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>21</java.version>
         <mybatis.version>3.5.16</mybatis.version>
-        <springdoc.version>2.8.4</springdoc.version>
+        <springdoc.version>2.3.0</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
         <easyexcel.version>4.0.3</easyexcel.version>
         <velocity.version>2.3</velocity.version>

xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml

@@ -44,7 +44,17 @@
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
-            <version>4.4.0</version>
+            <version>4.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springdoc</groupId>
+                    <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springdoc</groupId>
+                    <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

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;
 
     /**
      * 结算单位 客户信息名称

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;
+
     /**
      * 审定日期
      */

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<XzdSe
     private SysOssServiceImpl sysOssService;
 
 
+    private final IXzdProjectService xzdProjectService;
+
     @Autowired
     private IXzdJsDeductionItemsService deductionItemsService;
 
@@ -90,6 +94,14 @@ public class XzdSettlementOfJixieCompletionServiceImpl extends ServiceImpl<XzdSe
                 if (xzdJsDeductionItems != null && xzdJsDeductionItems.size() > 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());
+                }
+
+            }
         }
 
     }