From 7ec73544f640640bbc8f7de256c75ff79306da75 Mon Sep 17 00:00:00 2001 From: wyw <13885678+wyw0828@user.noreply.gitee.com> Date: Fri, 26 Jul 2024 10:20:33 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/contractHistory/ContractHistoryController.java | 7 ++++--- .../admin/customerCompany/CustomerCompanyController.java | 1 - .../ContractHistoryService.java | 6 +++--- .../ContractHistoryServiceImpl.java | 7 +++++-- 4 files changed, 12 insertions(+), 9 deletions(-) rename yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/{contracthistory => contractHistory}/ContractHistoryService.java (87%) rename yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/{contracthistory => contractHistory}/ContractHistoryServiceImpl.java (89%) diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/ContractHistoryController.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/ContractHistoryController.java index 65606eb97..f67a36055 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/ContractHistoryController.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/ContractHistoryController.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.contractHistory; import cn.iocoder.yudao.module.cms.dal.dataobject.contractHistory.ContractHistoryDO; import cn.iocoder.yudao.module.cms.dal.mysql.contract.ContractMapper; -import cn.iocoder.yudao.module.cms.service.contracthistory.ContractHistoryService; +import cn.iocoder.yudao.module.cms.service.contractHistory.ContractHistoryService; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -14,6 +14,7 @@ import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.*; import jakarta.servlet.http.*; +import java.beans.Beans; import java.io.IOException; import java.util.List; @@ -73,9 +74,9 @@ public class ContractHistoryController { @Operation(summary = "获得历史合同") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('cms:contract-history:query')") - public CommonResult getContractHistory(@RequestParam("id") Long id) { + public CommonResult getContractHistory(@RequestParam("id") Long id) { ContractHistoryDO contractHistory = contractHistoryService.getContractHistory(id); - return success(BeanUtils.toBean(contractHistory, ContractHistoryRespVO.class)); + return success(BeanUtils.toBean(contractHistory, ContractHistoryDO.class)); } @GetMapping("/page") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/CustomerCompanyController.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/CustomerCompanyController.java index 370effa86..b43ba363b 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/CustomerCompanyController.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/CustomerCompanyController.java @@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contracthistory/ContractHistoryService.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryService.java similarity index 87% rename from yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contracthistory/ContractHistoryService.java rename to yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryService.java index 84c97a26d..c71263301 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contracthistory/ContractHistoryService.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.cms.service.contracthistory; +package cn.iocoder.yudao.module.cms.service.contractHistory; import jakarta.validation.*; import cn.iocoder.yudao.module.cms.controller.admin.contractHistory.vo.*; @@ -37,10 +37,10 @@ public interface ContractHistoryService { /** * 获得历史合同 * - * @param id 编号 + * @param contractId 现有合同编号 * @return 历史合同 */ - ContractHistoryDO getContractHistory(Long id); + ContractHistoryDO getContractHistory(Long contractId); /** * 获得历史合同分页 diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contracthistory/ContractHistoryServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java similarity index 89% rename from yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contracthistory/ContractHistoryServiceImpl.java rename to yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java index 4d89b1ccc..788bc1807 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contracthistory/ContractHistoryServiceImpl.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java @@ -1,5 +1,6 @@ -package cn.iocoder.yudao.module.cms.service.contracthistory; +package cn.iocoder.yudao.module.cms.service.contractHistory; +import cn.iocoder.yudao.module.cms.dal.mysql.contract.ContractMapper; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -21,11 +22,13 @@ import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*; */ @Service @Validated -public class ContractHistoryServiceImpl implements ContractHistoryService { +public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.service.contractHistory.ContractHistoryService { @Resource private ContractHistoryMapper contractHistoryMapper; + + @Override public Long createContractHistory(ContractHistorySaveReqVO createReqVO) { // 插入