hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-02-02 03:34:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-contract-7.22-wyw' into feature-merage-7.26-zqc

Browse Source
This commit is contained in:
Qiancheng Zhao 2024-07-30 14:33:46 +08:00
commit 982f817f4c
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/ContractHistoryController.java
View File

@ -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.dataobject.contractHistory.ContractHistoryDO;
import cn.iocoder.yudao.module.cms.dal.mysql.contract.ContractMapper; 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 org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -14,6 +14,7 @@ import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*; import jakarta.validation.*;
import jakarta.servlet.http.*; import jakarta.servlet.http.*;
import java.beans.Beans;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
@ -73,9 +74,9 @@ public class ContractHistoryController {
@Operation(summary = "获得历史合同") @Operation(summary = "获得历史合同")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('cms:contract-history:query')") @PreAuthorize("@ss.hasPermission('cms:contract-history:query')")
public CommonResult<ContractHistoryRespVO> getContractHistory(@RequestParam("id") Long id) { public CommonResult<ContractHistoryDO> getContractHistory(@RequestParam("id") Long id) {
ContractHistoryDO contractHistory = contractHistoryService.getContractHistory(id); ContractHistoryDO contractHistory = contractHistoryService.getContractHistory(id);
return success(BeanUtils.toBean(contractHistory, ContractHistoryRespVO.class)); return success(BeanUtils.toBean(contractHistory, ContractHistoryDO.class));
} }
@GetMapping("/page") @GetMapping("/page")

1
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/CustomerCompanyController.java
View File

@ -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.Parameter;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*; import jakarta.validation.*;
import jakarta.servlet.http.*; import jakarta.servlet.http.*;
import java.util.*; import java.util.*;

6
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contracthistory/ContractHistoryService.java → yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryService.java
View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.cms.service.contracthistory; package cn.iocoder.yudao.module.cms.service.contractHistory;
import jakarta.validation.*; import jakarta.validation.*;
import cn.iocoder.yudao.module.cms.controller.admin.contractHistory.vo.*; import cn.iocoder.yudao.module.cms.controller.admin.contractHistory.vo.*;
@ -37,10 +37,10 @@ public interface ContractHistoryService {
/** /**
* 获得历史合同 * 获得历史合同
* *
* @param id 编号 * @param contractId 现有合同编号
* @return 历史合同 * @return 历史合同
*/ */
ContractHistoryDO getContractHistory(Long id); ContractHistoryDO getContractHistory(Long contractId);
/** /**
* 获得历史合同分页 * 获得历史合同分页

7
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contracthistory/ContractHistoryServiceImpl.java → yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java
View File

@ -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 org.springframework.stereotype.Service;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -21,11 +22,13 @@ import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
*/ */
@Service @Service
@Validated @Validated
public class ContractHistoryServiceImpl implements ContractHistoryService { public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.service.contractHistory.ContractHistoryService {
@Resource @Resource
private ContractHistoryMapper contractHistoryMapper; private ContractHistoryMapper contractHistoryMapper;
@Override @Override
public Long createContractHistory(ContractHistorySaveReqVO createReqVO) { public Long createContractHistory(ContractHistorySaveReqVO createReqVO) {
// 插入 // 插入