From b9967f6000046dab64f602cba884a1b1155579c2 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Fri, 24 Oct 2025 11:30:09 +0800 Subject: [PATCH] =?UTF-8?q?vo=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8F=90=E4=BE=9B=E5=88=9B=E5=BB=BA=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=8E=A5=E5=8F=A3=EF=BC=9A=E7=9B=B4=E6=8E=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=88=90=E5=8A=9F=EF=BC=8C=E5=8F=AA=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E6=9A=82=E6=97=B6=E4=B8=8D=E5=86=99?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E5=8F=82=E6=95=B0=E6=9A=82=E5=AD=98=E8=87=B3redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zt-module-contract-order-api/pom.xml | 6 +++++ .../module/contractorder/api/ContractApi.java | 6 +++++ .../api/dto/PurchaseOrderWithDetailsDTO.java | 1 - .../api}/vo/contract/ApprovalReqVO.java | 2 +- .../api}/vo/contract/CoefficientRespVO.java | 2 +- .../vo/contract/CoefficientSaveReqVO.java | 2 +- .../api}/vo/contract/ContractPageReqVO.java | 2 +- .../api}/vo/contract/ContractRespVO.java | 5 ++-- .../api}/vo/contract/ContractSaveReqVO.java | 4 +--- .../api}/vo/contract/DeductRespVO.java | 2 +- .../api}/vo/contract/DeductSaveReqVO.java | 2 +- .../api}/vo/contract/DemoteRespVO.java | 4 +--- .../api}/vo/contract/DemoteSaveReqVO.java | 2 +- .../api}/vo/contract/DemotesQueryReqVO.java | 2 +- .../api}/vo/contract/DetailRespVO.java | 2 +- .../api}/vo/contract/DetailSaveReqVO.java | 2 +- .../api}/vo/contract/FormulaRespVO.java | 2 +- .../api}/vo/contract/FormulaSaveReqVO.java | 2 +- .../api}/vo/contract/FormulasQueryReqVO.java | 2 +- .../api}/vo/contract/GradeRespVO.java | 2 +- .../api}/vo/contract/GradeSaveReqVO.java | 2 +- .../api}/vo/contract/NotRespVO.java | 4 +--- .../api}/vo/contract/NotSaveReqVO.java | 2 +- .../api}/vo/contract/NotsQueryReqVO.java | 2 +- .../api}/vo/contract/PlanRespVO.java | 2 +- .../api}/vo/contract/PlanSaveReqVO.java | 2 +- .../api}/vo/contract/PriceRespVO.java | 2 +- .../api}/vo/contract/PriceSaveReqVO.java | 2 +- .../api}/vo/contract/RelationReqVo.java | 2 +- .../api}/vo/contract/RelationRespVO.java | 2 +- .../contractorder/api/ContractApiImpl.java | 24 +++++++++++++++++-- .../admin/contract/ContractController.java | 2 +- .../PurchaseOrderController.java | 2 -- .../vo/PurchaseOrderDetailsRespVO.java | 1 - .../mysql/contract/ContractDemoteMapper.java | 2 +- .../mysql/contract/ContractFormulaMapper.java | 2 +- .../mysql/contract/ContractMainMapper.java | 2 +- .../dal/mysql/contract/ContractNotMapper.java | 2 +- .../service/contract/ContractService.java | 3 +-- .../service/contract/ContractServiceImpl.java | 2 +- .../PurchaseOrderServiceImpl.java | 4 +--- 41 files changed, 70 insertions(+), 52 deletions(-) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/ApprovalReqVO.java (91%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/CoefficientRespVO.java (93%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/CoefficientSaveReqVO.java (93%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/ContractPageReqVO.java (94%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/ContractRespVO.java (98%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/ContractSaveReqVO.java (98%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/DeductRespVO.java (93%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/DeductSaveReqVO.java (92%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/DemoteRespVO.java (88%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/DemoteSaveReqVO.java (94%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/DemotesQueryReqVO.java (86%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/DetailRespVO.java (92%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/DetailSaveReqVO.java (94%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/FormulaRespVO.java (95%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/FormulaSaveReqVO.java (95%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/FormulasQueryReqVO.java (86%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/GradeRespVO.java (95%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/GradeSaveReqVO.java (95%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/NotRespVO.java (88%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/NotSaveReqVO.java (94%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/NotsQueryReqVO.java (86%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/PlanRespVO.java (89%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/PlanSaveReqVO.java (90%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/PriceRespVO.java (94%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/PriceSaveReqVO.java (94%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/RelationReqVo.java (87%) rename zt-module-contract-order/{zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract => zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api}/vo/contract/RelationRespVO.java (79%) diff --git a/zt-module-contract-order/zt-module-contract-order-api/pom.xml b/zt-module-contract-order/zt-module-contract-order-api/pom.xml index fe89600..868fdd4 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/pom.xml +++ b/zt-module-contract-order/zt-module-contract-order-api/pom.xml @@ -41,6 +41,12 @@ spring-cloud-starter-openfeign true + + + com.zt.plat + zt-module-base-server + ${revision} + diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java index 9f90fcc..6b94287 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java +++ b/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> getOrderByOrderNo(@RequestBody List orderNoS); + + @PostMapping(PREFIX + "/create") + @Operation(summary = "创建合同") + CommonResult create(@Valid @RequestBody ContractSaveReqVO reqVO); } diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PurchaseOrderWithDetailsDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PurchaseOrderWithDetailsDTO.java index 70b69dc..c353973 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PurchaseOrderWithDetailsDTO.java +++ b/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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ApprovalReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ApprovalReqVO.java similarity index 91% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ApprovalReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ApprovalReqVO.java index 92e166d..80e186f 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ApprovalReqVO.java +++ b/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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/CoefficientRespVO.java similarity index 93% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/CoefficientRespVO.java index cd5c769..d34674c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java +++ b/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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/CoefficientSaveReqVO.java similarity index 93% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/CoefficientSaveReqVO.java index 91c91bc..8933d00 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java +++ b/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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPageReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractPageReqVO.java similarity index 94% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPageReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractPageReqVO.java index 73b4347..bce3e3d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPageReqVO.java +++ b/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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java similarity index 98% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java index b12ffe3..cf1c8cc 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractRespVO.java +++ b/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 = "主键") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractSaveReqVO.java similarity index 98% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractSaveReqVO.java index 8854836..eeb6bc9 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java +++ b/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 = "步骤不能为空") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DeductRespVO.java similarity index 93% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DeductRespVO.java index e544e2b..f9bd698 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java +++ b/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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DeductSaveReqVO.java similarity index 92% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DeductSaveReqVO.java index fa796e3..017bfc8 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DeductSaveReqVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemoteRespVO.java similarity index 88% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemoteRespVO.java index 2c98340..d558ce4 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemoteRespVO.java @@ -1,6 +1,5 @@ -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 io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -9,7 +8,6 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - 参数降级规则 Response VO") @Data -@ExcelIgnoreUnannotated public class DemoteRespVO { @Schema(description = "主键") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemoteSaveReqVO.java similarity index 94% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemoteSaveReqVO.java index a5808f1..6ba82b5 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemoteSaveReqVO.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.NotNull; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemotesQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java similarity index 86% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemotesQueryReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java index 4a2f0e0..ad5c2d0 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemotesQueryReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java similarity index 92% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java index be4af9b..8a1a079 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailSaveReqVO.java similarity index 94% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailSaveReqVO.java index d6453c4..34c5aa6 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailSaveReqVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulaRespVO.java similarity index 95% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulaRespVO.java index 75d20b0..f752252 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulaRespVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulaSaveReqVO.java similarity index 95% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulaSaveReqVO.java index aed20f9..8f9b6ff 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulaSaveReqVO.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 cn.hutool.json.JSONArray; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulasQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java similarity index 86% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulasQueryReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java index 85e49d1..e1e6176 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulasQueryReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/GradeRespVO.java similarity index 95% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/GradeRespVO.java index fca29ec..5752326 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/GradeRespVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/GradeSaveReqVO.java similarity index 95% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/GradeSaveReqVO.java index 3dbc60f..4ee3e54 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/GradeSaveReqVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotRespVO.java similarity index 88% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotRespVO.java index 1f918fa..914bb49 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotRespVO.java @@ -1,6 +1,5 @@ -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 io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -9,7 +8,6 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - 品位不计价规则 Response VO") @Data -@ExcelIgnoreUnannotated public class NotRespVO { @Schema(description = "主键") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotSaveReqVO.java similarity index 94% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotSaveReqVO.java index 78afc87..cc693b0 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotSaveReqVO.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.NotNull; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotsQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java similarity index 86% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotsQueryReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java index e8709bf..1748592 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotsQueryReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PlanRespVO.java similarity index 89% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PlanRespVO.java index 517ca47..6a62892 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PlanRespVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PlanSaveReqVO.java similarity index 90% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PlanSaveReqVO.java index 6ee919d..2f7977d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PlanSaveReqVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PriceRespVO.java similarity index 94% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PriceRespVO.java index da35f5d..4fe2e4d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PriceRespVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PriceSaveReqVO.java similarity index 94% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PriceSaveReqVO.java index 06501e2..5e83ae3 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/PriceSaveReqVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/RelationReqVo.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/RelationReqVo.java similarity index 87% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/RelationReqVo.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/RelationReqVo.java index 2781618..2ef612f 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/RelationReqVo.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/RelationReqVo.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/RelationRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/RelationRespVO.java similarity index 79% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/RelationRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/RelationRespVO.java index 9e87427..8a499cb 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/RelationRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/RelationRespVO.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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java index 5b0c737..f7cc8be 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java @@ -4,16 +4,21 @@ import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.contractorder.api.dto.PrchOrdDtlDTO; import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO; -import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseOrderDetailsRespVO; -import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseOrderWithDetailsVO; 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.controller.admin.purchaseorder.vo.PurchaseOrderDetailsRespVO; import com.zt.plat.module.contractorder.service.contract.ContractService; import com.zt.plat.module.contractorder.service.purchaseorder.PurchaseOrderService; import jakarta.annotation.Resource; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -28,6 +33,8 @@ public class ContractApiImpl implements ContractApi { private ContractService contractService; @Resource private PurchaseOrderService purchaseOrderService; + @Resource + private RedisTemplate redisTemplate; @Override public ContractRespDTO getContractByPaperNumber(String contractPaperNumber) { @@ -57,4 +64,17 @@ public class ContractApiImpl implements ContractApi { }); return success(purchaseOrderWithDetailsDTOS); } + + @Override + public CommonResult create(@Valid @RequestBody ContractSaveReqVO reqVO) { + log.info("外部调用创建合同接口，参数：{}", reqVO); + redisTemplate.opsForHash().put( + "HT-TEMP", + reqVO.getContractPaperNumber() + + "-" + + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmSSS")), + reqVO) + ; + return success(true); + } } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java index 41ba61e..6988a2a 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java @@ -5,7 +5,7 @@ import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*; +import com.zt.plat.module.contractorder.api.vo.contract.*; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO; import com.zt.plat.module.contractorder.service.contract.ContractService; import io.swagger.v3.oas.annotations.Operation; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java index f204982..1c20680 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java @@ -1,9 +1,7 @@ package com.zt.plat.module.contractorder.controller.admin.purchaseorder; import com.zt.plat.module.contractorder.api.ContractApiImpl; -import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO; import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*; -import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderSaveReqVO; import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.zt.plat.module.contractorder.service.purchaseorder.PurchaseOrderService; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java index 37f143c..3a0b69c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java @@ -1,6 +1,5 @@ package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo; -import com.zt.plat.module.contractorder.api.dto.PrchOrdDtlDTO; import lombok.Data; import java.math.BigDecimal; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java index 15008e8..b961ee9 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java @@ -1,7 +1,7 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.DemoteRespVO; +import com.zt.plat.module.contractorder.api.vo.contract.DemoteRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractDemoteDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java index 39d3d6e..968260a 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java @@ -1,7 +1,7 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.FormulaRespVO; +import com.zt.plat.module.contractorder.api.vo.contract.FormulaRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractFormulaDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractMainMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractMainMapper.java index c3705fb..6819ec4 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractMainMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractMainMapper.java @@ -3,7 +3,7 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.ContractPageReqVO; +import com.zt.plat.module.contractorder.api.vo.contract.ContractPageReqVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO; import org.apache.ibatis.annotations.Mapper; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java index d0ea42e..8f10f5c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java @@ -1,7 +1,7 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.NotRespVO; +import com.zt.plat.module.contractorder.api.vo.contract.NotRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractNotDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java index 6b229bb..81e3461 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java @@ -3,8 +3,7 @@ package com.zt.plat.module.contractorder.service.contract; import cn.hutool.json.JSONObject; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*; -import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.LinkOrderReqVO; +import com.zt.plat.module.contractorder.api.vo.contract.*; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO; import jakarta.validation.Valid; import org.springframework.core.io.ByteArrayResource; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index c1f287a..9ebf476 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -23,7 +23,7 @@ import com.zt.plat.module.bpm.api.task.BpmTaskApi; import com.zt.plat.module.bpm.api.task.dto.*; import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum; import com.zt.plat.module.contractorder.api.dto.contract.*; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*; +import com.zt.plat.module.contractorder.api.vo.contract.*; import com.zt.plat.module.contractorder.dal.dataobject.contract.*; import com.zt.plat.module.contractorder.dal.mysql.contract.*; import com.zt.plat.module.contractorder.enums.*; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java index fac2f8f..68bcc94 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -11,9 +11,8 @@ import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi; import com.zt.plat.module.bpm.api.task.BpmTaskApi; import com.zt.plat.module.bpm.api.task.dto.*; import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.ContractRespVO; +import com.zt.plat.module.contractorder.api.vo.contract.ContractRespVO; import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*; -import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderSaveReqVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.SystemRelativityDO; import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PrchOrdDtlDO; import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO; @@ -41,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils;