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

zt-module-contract-order/zt-module-contract-order-api/pom.xml

@@ -41,6 +41,12 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-base-server</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 
 </project>

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java

@@ -4,9 +4,11 @@ package com.zt.plat.module.contractorder.api;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO;
 import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
+import com.zt.plat.module.contractorder.api.vo.contract.ContractSaveReqVO;
 import com.zt.plat.module.contractorder.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,4 +33,8 @@ public interface ContractApi {
     @PostMapping(PREFIX + "/order-by-order-no")
     @Operation(summary = "更新订单状态", description = "通过订单编号获取订单信息")
     CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderNo(@RequestBody List<String> orderNoS);
+
+    @PostMapping(PREFIX + "/create")
+    @Operation(summary = "创建合同")
+    CommonResult<Boolean> create(@Valid @RequestBody ContractSaveReqVO reqVO);
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PurchaseOrderWithDetailsDTO.java

@@ -1,6 +1,5 @@
 package com.zt.plat.module.contractorder.api.dto;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ApprovalReqVO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/CoefficientRespVO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/CoefficientSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractPageReqVO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java

@@ -1,6 +1,6 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
+
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceItemRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -12,7 +12,6 @@ import java.util.List;
 
 @Schema(description = "管理后台 - 合同详情 Response VO")
 @Data
-@ExcelIgnoreUnannotated
 public class ContractRespVO {
 
     @Schema(description = "主键")

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractSaveReqVO.java

@@ -1,7 +1,6 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import cn.hutool.json.JSONArray;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -17,7 +16,6 @@ import java.util.List;
 public class ContractSaveReqVO {
 
     @Schema(description = "主键，新增时为空，修改时需要有值")
-    @ExcelProperty("主键")
     private Long id;
 
     @NotNull(message = "步骤不能为空")

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DeductRespVO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;