hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 00:15:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[feat] 新增外包合同历史管理

Browse Source
This commit is contained in:
wyw
2024-08-02 13:22:33 +08:00
parent e0c60dd15b
commit 2e9937cad2
11 changed files with 1090 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/OutsContractHistoryController.java
View File

@ -9,7 +9,6 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistorySaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
import cn.iocoder.yudao.module.cms.service.outscontracthistory.OutsContractHistoryService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -36,13 +35,6 @@ public class OutsContractHistoryController {
@Resource
private OutsContractHistoryService outsContractHistoryService;
@PostMapping("/create")
@Operation(summary = "创建外包合同历史")
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:create')")
public CommonResult<Long> createOutsContractHistory(@Valid @RequestBody OutsContractHistorySaveReqVO createReqVO) {
return success(outsContractHistoryService.createOutsContractHistory(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新外包合同历史")
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:update')")
@ -51,30 +43,21 @@ public class OutsContractHistoryController {
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除外包合同历史")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:delete')")
public CommonResult<Boolean> deleteOutsContractHistory(@RequestParam("id") Long id) {
outsContractHistoryService.deleteOutsContractHistory(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得外包合同历史")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:query')")
public CommonResult<OutsContractHistoryRespVO> getOutsContractHistory(@RequestParam("id") Long id) {
OutsContractHistoryDO outsContractHistory = outsContractHistoryService.getOutsContractHistory(id);
return success(BeanUtils.toBean(outsContractHistory, OutsContractHistoryRespVO.class));
OutsContractHistoryRespVO outsContractHistory = outsContractHistoryService.getOutsContractHistory(id);
return success(outsContractHistory);
}
@GetMapping("/page")
@Operation(summary = "获得外包合同历史分页")
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:query')")
public CommonResult<PageResult<OutsContractHistoryRespVO>> getOutsContractHistoryPage(@Valid OutsContractHistoryPageReqVO pageReqVO) {
PageResult<OutsContractHistoryDO> pageResult = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, OutsContractHistoryRespVO.class));
PageResult<OutsContractHistoryRespVO> pageResult = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/export-excel")
@ -84,7 +67,7 @@ public class OutsContractHistoryController {
public void exportOutsContractHistoryExcel(@Valid OutsContractHistoryPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<OutsContractHistoryDO> list = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO).getList();
List<OutsContractHistoryRespVO> list = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "外包合同历史.xls", "数据", OutsContractHistoryRespVO.class,
BeanUtils.toBean(list, OutsContractHistoryRespVO.class));

23
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryPageReqVO.java
View File

@ -30,32 +30,9 @@ public class OutsContractHistoryPageReqVO extends PageParam {
@Schema(description = "类型", example = "1")
private String countType;
@Schema(description = "合同金额")
private BigDecimal amount;
@Schema(description = "编号")
private String code;
@Schema(description = "专业")
private String major;
@Schema(description = "流程实体id", example = "32397")
private String processInstanceId;
@Schema(description = "签订时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] signingTime;
@Schema(description = "结算数")
private BigDecimal settlementAmount;
@Schema(description = "合同文件url", example = "https://www.iocoder.cn")
private String contractFileUrl;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "流程状态", example = "2")
private String processStatus;

27
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryRespVO.java
View File

@ -15,18 +15,23 @@ import java.time.LocalDateTime;
@ExcelIgnoreUnannotated
public class OutsContractHistoryRespVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16040")
@ExcelProperty("主键")
private Long id;
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31803")
@ExcelProperty("项目id")
private Long projectId;
@Schema(description = "合同名称", example = "芋艿")
@Schema(description = "合同名称", example = "张三")
@ExcelProperty("合同名称")
private String name;
@Schema(description = "主控部门", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产一部")
@ExcelProperty("主控部门")
private String trackingDep;
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("项目经理")
private String projectManager;
@Schema(description = "签订合同总额")
@ExcelProperty("签订合同总额")
private BigDecimal outsAmount;
@Schema(description = "主合同id", example = "19949")
@ExcelProperty("主合同id")
private Long contractId;
@ -65,10 +70,6 @@ public class OutsContractHistoryRespVO {
@ExcelProperty("合同文件url")
private String contractFileUrl;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "流程状态", example = "2")
@ExcelProperty("流程状态")
private String processStatus;

19
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistorySaveReqVO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -18,9 +19,25 @@ public class OutsContractHistorySaveReqVO {
@NotNull(message = "项目id不能为空")
private Long projectId;
@Schema(description = "合同名称", example = "芋艿")
@Schema(description = "合同名称", example = "张三")
@ExcelProperty("合同名称")
private String name;
@Schema(description = "主控部门", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产一部")
@ExcelProperty("主控部门")
private String trackingDep;
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("项目经理")
private String projectManager;
@Schema(description = "签订合同总额")
@ExcelProperty("签订合同总额")
private BigDecimal outsAmount;
@Schema(description = "主合同id", example = "19949")
private Long contractId;

10
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontracthistory/OutsContractHistoryMapper.java
View File

@ -21,18 +21,10 @@ public interface OutsContractHistoryMapper extends BaseMapperX<OutsContractHisto
.likeIfPresent(OutsContractHistoryDO::getName, reqVO.getName())
.eqIfPresent(OutsContractHistoryDO::getContractId, reqVO.getContractId())
.eqIfPresent(OutsContractHistoryDO::getCountType, reqVO.getCountType())
.eqIfPresent(OutsContractHistoryDO::getAmount, reqVO.getAmount())
.eqIfPresent(OutsContractHistoryDO::getCode, reqVO.getCode())
.eqIfPresent(OutsContractHistoryDO::getMajor, reqVO.getMajor())
.eqIfPresent(OutsContractHistoryDO::getProcessInstanceId, reqVO.getProcessInstanceId())
.betweenIfPresent(OutsContractHistoryDO::getSigningTime, reqVO.getSigningTime())
.eqIfPresent(OutsContractHistoryDO::getSettlementAmount, reqVO.getSettlementAmount())
.eqIfPresent(OutsContractHistoryDO::getContractFileUrl, reqVO.getContractFileUrl())
.betweenIfPresent(OutsContractHistoryDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(OutsContractHistoryDO::getProcessStatus, reqVO.getProcessStatus())
.eqIfPresent(OutsContractHistoryDO::getOutsContractId, reqVO.getOutsContractId())
.eqIfPresent(OutsContractHistoryDO::getVersion, reqVO.getVersion())
.orderByDesc(OutsContractHistoryDO::getId));
.eqIfPresent(OutsContractHistoryDO::getVersion, reqVO.getVersion()));
}
}

19
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryService.java
View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.cms.service.outscontracthistory;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistorySaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
import jakarta.validation.Valid;
@ -13,14 +14,6 @@ import jakarta.validation.Valid;
*/
public interface OutsContractHistoryService {
/**
* 创建外包合同历史
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createOutsContractHistory(@Valid OutsContractHistorySaveReqVO createReqVO);
/**
* 更新外包合同历史
*
@ -28,12 +21,6 @@ public interface OutsContractHistoryService {
*/
void updateOutsContractHistory(@Valid OutsContractHistorySaveReqVO updateReqVO);
/**
* 删除外包合同历史
*
* @param id 编号
*/
void deleteOutsContractHistory(Long id);
/**
* 获得外包合同历史
@ -41,7 +28,7 @@ public interface OutsContractHistoryService {
* @param id 编号
* @return 外包合同历史
*/
OutsContractHistoryDO getOutsContractHistory(Long id);
OutsContractHistoryRespVO getOutsContractHistory(Long id);
/**
* 获得外包合同历史分页
@ -49,6 +36,6 @@ public interface OutsContractHistoryService {
* @param pageReqVO 分页查询
* @return 外包合同历史分页
*/
PageResult<OutsContractHistoryDO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO);
PageResult<OutsContractHistoryRespVO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO);
}

77
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java
View File

@ -2,16 +2,25 @@ package cn.iocoder.yudao.module.cms.service.outscontracthistory;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistorySaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHistoryMapper;
import cn.iocoder.yudao.module.cms.service.contract.ContractService;
import cn.iocoder.yudao.module.pms.api.ProjectApi;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.OUTS_CONTRACT_HISTORY_NOT_EXISTS;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.PROJECT_NOT_EXISTS;
/**
* 外包合同历史 Service 实现类
@ -25,14 +34,11 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
@Resource
private OutsContractHistoryMapper outsContractHistoryMapper;
@Override
public Long createOutsContractHistory(OutsContractHistorySaveReqVO createReqVO) {
// 插入
OutsContractHistoryDO outsContractHistory = BeanUtils.toBean(createReqVO, OutsContractHistoryDO.class);
outsContractHistoryMapper.insert(outsContractHistory);
// 返回
return outsContractHistory.getId();
}
@Resource
private ProjectApi projectApi;
@Resource
private ContractService contractService;
@Override
public void updateOutsContractHistory(OutsContractHistorySaveReqVO updateReqVO) {
@ -43,14 +49,6 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
outsContractHistoryMapper.updateById(updateObj);
}
@Override
public void deleteOutsContractHistory(Long id) {
// 校验存在
validateOutsContractHistoryExists(id);
// 删除
outsContractHistoryMapper.deleteById(id);
}
private void validateOutsContractHistoryExists(Long id) {
if (outsContractHistoryMapper.selectById(id) == null) {
throw exception(OUTS_CONTRACT_HISTORY_NOT_EXISTS);
@ -58,13 +56,50 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
}
@Override
public OutsContractHistoryDO getOutsContractHistory(Long id) {
return outsContractHistoryMapper.selectById(id);
public OutsContractHistoryRespVO getOutsContractHistory(Long id) {
//校验
if (id == null) {
throw exception(OUTS_CONTRACT_NOT_EXISTS);
}
OutsContractHistoryDO outsContractHistoryDO = outsContractHistoryMapper.selectById(id);
OutsContractHistoryRespVO outsContractHistoryResp = BeanUtils.toBean(outsContractHistoryDO, OutsContractHistoryRespVO.class);
Long contractId = outsContractHistoryResp.getContractId();
ContractRespVO contract = contractService.getContract(contractId);
outsContractHistoryResp.setName(contract.getName());
outsContractHistoryResp.setTrackingDep(contract.getTrackingDep());
outsContractHistoryResp.setProjectManager(contract.getProjectManager());
outsContractHistoryResp.setOutsAmount(contract.getAmount());
return outsContractHistoryResp;
}
@Override
public PageResult<OutsContractHistoryDO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO) {
return outsContractHistoryMapper.selectPage(pageReqVO);
public PageResult<OutsContractHistoryRespVO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO) {
if (pageReqVO == null) {
throw exception(PARAM_NOT_EXISTS);
}
Long projectId = pageReqVO.getProjectId();
ProjectRespDTO project = projectApi.getProject(projectId);
if (project == null) {
throw exception(PROJECT_NOT_EXISTS);
}
PageResult<OutsContractHistoryDO> outsContractHistoryPage = outsContractHistoryMapper.selectPage(pageReqVO);
List<OutsContractHistoryDO> outsContractDOList = outsContractHistoryPage.getList();
List<OutsContractHistoryRespVO> outsContractRespVOList = new ArrayList<>();
for (OutsContractHistoryDO outsContractHistoryDO : outsContractDOList) {
Long id = outsContractHistoryDO.getId();
OutsContractHistoryRespVO outsContractHistory = getOutsContractHistory(id);
outsContractRespVOList.add(outsContractHistory);
}
PageResult<OutsContractHistoryRespVO> pageResult = new PageResult<>();
pageResult.setList(outsContractRespVOList);
return pageResult;
}
}