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

[fix] 优化合同管理

Browse Source
This commit is contained in:
wyw
2024-08-14 16:53:38 +08:00
parent 39c410f56e
commit 97c7a8abc8
47 changed files with 426 additions and 904 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/contract/ContractController.java
View File

@@ -1,10 +1,11 @@
package cn.iocoder.yudao.module.cms.controller.admin.contract;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessInstanceRespVO;
import cn.iocoder.yudao.framework.common.util.file.FileUtils;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractSaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDetailDO;
import cn.iocoder.yudao.module.cms.service.contract.ContractService;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
@@ -69,7 +70,12 @@ public class ContractController {
@Parameter(name = "id", description = "合同id", required = true)
@PreAuthorize("@ss.hasPermission('cms:contract:query')")
public CommonResult<ContractRespVO> getContract(@RequestParam("id") Long id) {
ContractRespVO contractRespVO = contractService.getContract(id);
ContractDetailDO contractDetailDO = contractService.getContractDetail(id);
ContractRespVO contractRespVO = new ContractRespVO();
org.springframework.beans.BeanUtils.copyProperties(contractDetailDO, contractRespVO, "contractFileUrl", "reviewFileUrl");
contractRespVO.setReviewFileUrl(FileUtils.covertJSONStringToFile(contractDetailDO.getReviewFileUrl()));
contractRespVO.setContractFileUrl(FileUtils.covertJSONStringToFile(contractDetailDO.getContractFileUrl()));
return success(contractRespVO);
}
@@ -94,22 +100,5 @@ public class ContractController {
BeanUtils.toBean(list, ContractRespVO.class));
}
@GetMapping("/get_process")
@Operation(summary = "查询流程")
@Parameter(name = "id", description = "合同id", required = true)
@PreAuthorize("@ss.hasPermission('cms:contract:process')")
public CommonResult<ContractProcessInstanceRespVO> getContractProcess(@RequestParam("id") Long id) {
ContractProcessInstanceRespVO contractProcessInstance = contractService.getContractProcess(id);
return success(contractProcessInstance);
}
@GetMapping("/get_HistoryProcess")
@Operation(summary = "查询历史合同流程")
@Parameter(name = "projectId", description = "项目id", required = true)
@PreAuthorize("@ss.hasPermission('cms:contract:process')")
public CommonResult<List<ContractProcessInstanceRespVO>> getHisContractProcess(@RequestParam("projectId") Long projectId) {
List<ContractProcessInstanceRespVO> historyContractProcess = contractService.getHistoryContractProcess(projectId);
return success(historyContractProcess);
}
}

6
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractPageReqVO.java
View File

@@ -16,16 +16,10 @@ public class ContractPageReqVO extends PageParam {
@Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED)
private Long projectId;
@Schema(description = "合同名称", example = "芋艿")
private String name;
@Schema(description = "合同类型", example = "2")
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
private String type;
@Schema(description = "合同进展",example = "1")
private String progress;
@Schema(description = "合同状态", example = "1")
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
private String status;

69
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractProcessInstanceRespVO.java
View File

@@ -1,69 +0,0 @@
package cn.iocoder.yudao.module.cms.controller.admin.contract.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Schema(description = "管理后台 - 流程实例的 Response VO")
@Data
public class ContractProcessInstanceRespVO {
@Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED)
private String id;
@Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String name;
@Schema(description = "流程实例的状态", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer status; // 参见 BpmProcessInstanceStatusEnum 枚举
@Schema(description = "发起时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime startTime;
@Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime endTime;
@Schema(description = "持续时间", example = "1000")
private Long durationInMillis;
/**
* 发起流程的用户
*/
private User startUser;
/**
* 当前审批中的任务
*/
private List<Task> tasks; // 仅在流程实例分页才返回
@Schema(description = "用户信息")
@Data
public static class User {
@Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id;
@Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
private String nickname;
@Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long deptId;
@Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
private String deptName;
}
@Schema(description = "流程任务")
@Data
public static class Task {
@Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id;
@Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name;
}
}

6
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractRespVO.java
View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.cms.controller.admin.contract.vo;
import cn.iocoder.yudao.framework.common.pojo.FileDTO;
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
@@ -9,6 +10,7 @@ import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.alibaba.excel.annotation.*;
@@ -113,7 +115,7 @@ public class ContractRespVO {
@Schema(description = "合同url", example = "https://www.iocoder.cn")
@ExcelProperty("合同url")
private String contractFileUrl;
private List<FileDTO> contractFileUrl;
@Schema(description = "建安费")
@ExcelProperty("建安费")
@@ -145,7 +147,7 @@ public class ContractRespVO {
@Schema(description = "审核文件url", example = "https://www.iocoder.cn")
@ExcelProperty("审核文件url")
private String reviewFileUrl;
private List<FileDTO> reviewFileUrl;
@Schema(description = "最后编辑人")
@ExcelProperty("最后编辑人")

6
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractSaveReqVO.java
View File

@@ -1,4 +1,5 @@
package cn.iocoder.yudao.module.cms.controller.admin.contract.vo;
import cn.iocoder.yudao.framework.common.pojo.FileDTO;
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
@@ -9,6 +10,7 @@ import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@Schema(description = "管理后台 - 合同新增/修改 Request VO")
@Data
@@ -109,7 +111,7 @@ public class ContractSaveReqVO {
@Schema(description = "合同url", example = "https://www.iocoder.cn")
@ExcelProperty("合同url")
private String contractFileUrl;
private List<FileDTO> contractFileUrl;
@Schema(description = "建安费")
@ExcelProperty("建安费")
@@ -141,7 +143,7 @@ public class ContractSaveReqVO {
@Schema(description = "审核文件url", example = "https://www.iocoder.cn")
@ExcelProperty("审核文件url")
private String reviewFileUrl;
private List<FileDTO> reviewFileUrl;
@Schema(description = "最后编辑人")
@ExcelProperty("最后编辑人")

19
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/ExtContractController.java
View File

@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.cms.controller.admin.extContract;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractSaveReqVO;
@@ -94,22 +93,4 @@ public class ExtContractController {
BeanUtils.toBean(list, ExtContractRespVO.class));
}
@GetMapping("/get_process")
@Operation(summary = "查询流程")
@Parameter(name = "id", description = "外部合同id", required = true)
@PreAuthorize("@ss.hasPermission('cms:contract:process')")
public CommonResult<ContractProcessInstanceRespVO> getContractProcess(@RequestParam("id") Long id) {
ContractProcessInstanceRespVO contractProcessInstance = extContractService.getContractProcess(id);
return success(contractProcessInstance);
}
@GetMapping("/get_HistoryProcess")
@Operation(summary = "查询历史外部合同流程")
@Parameter(name = "projectId", description = "项目id", required = true)
@PreAuthorize("@ss.hasPermission('cms:contract:process')")
public CommonResult<List<ContractProcessInstanceRespVO>> getHisContractProcess(@RequestParam("projectId") Long projectId) {
List<ContractProcessInstanceRespVO> historyContractProcess = extContractService.getHistoryContractProcess(projectId);
return success(historyContractProcess);
}
}

20
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/OutsContractController.java
View File

@@ -6,12 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractSaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO;
import cn.iocoder.yudao.module.cms.service.outscontract.OutsContractService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -92,21 +89,4 @@ public class OutsContractController {
ExcelUtils.write(response, "外包合同.xls", "数据", OutsContractRespVO.class,
BeanUtils.toBean(list, OutsContractRespVO.class));
}
@GetMapping("/get_process")
@Operation(summary = "查询流程")
@Parameter(name = "id", description = "外包合同id", required = true)
@PreAuthorize("@ss.hasPermission('cms:contract:process')")
public CommonResult<ContractProcessInstanceRespVO> getContractProcess(@RequestParam("id") Long id) {
ContractProcessInstanceRespVO contractProcessInstance = outsContractService.getContractProcess(id);
return success(contractProcessInstance);
}
@GetMapping("/get_HistoryProcess")
@Operation(summary = "查询历史外包合同流程")
@Parameter(name = "projectId", description = "项目id", required = true)
@PreAuthorize("@ss.hasPermission('cms:contract:process')")
public CommonResult<List<ContractProcessInstanceRespVO>> getHisContractProcess(@RequestParam("projectId") Long projectId) {
List<ContractProcessInstanceRespVO> historyContractProcess = outsContractService.getHistoryContractProcess(projectId);
return success(historyContractProcess);
}
}

2
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java
View File

@@ -1,9 +1,11 @@
package cn.iocoder.yudao.module.cms.dal.dataobject.contract;
import cn.iocoder.yudao.framework.common.pojo.FileDTO;
import lombok.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;

44
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDetailDO.java Normal file
View File

@@ -0,0 +1,44 @@
package cn.iocoder.yudao.module.cms.dal.dataobject.contract;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* @author wyw
* @description
* @date 2024/8/14
*/
@Data
public class ContractDetailDO extends ContractDO {
/**
* 项目编号
*/
private String code;
/**
* 跟踪部门
*/
private String trackingDep;
/**
* 出图公司
*/
private String drawingCompany;
/**
* 预计公司合同总金额
*/
private BigDecimal expectedContractAmount;
/**
* 项目负责人
*/
private String projectManager;
/**
* 合同商议提示
*/
private LocalDateTime reminderTime;
}

7
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/contract/ContractMapper.java
View File

@@ -17,15 +17,16 @@ public interface ContractMapper extends BaseMapperX<ContractDO> {
default PageResult<ContractDO> selectPage(ContractPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ContractDO>()
.likeIfPresent(ContractDO::getName, reqVO.getName())
.eqIfPresent(ContractDO::getType, reqVO.getType())
.eqIfPresent(ContractDO::getProjectId,reqVO.getProjectId())
.eqIfPresent(ContractDO::getProjectId, reqVO.getProjectId())
.eqIfPresent(ContractDO::getProgress, reqVO.getProgress())
.eqIfPresent(ContractDO::getStatus, reqVO.getStatus())
.eqIfPresent(ContractDO::getCountType, reqVO.getCountType())
);
}
}

8
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extContract/ExtContractMapper.java
View File

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractPa
import cn.iocoder.yudao.module.cms.dal.dataobject.extcontract.ExtContractDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 外部合同 Mapper
*
@@ -24,4 +26,10 @@ public interface ExtContractMapper extends BaseMapperX<ExtContractDO> {
.eqIfPresent(ExtContractDO::getContractId, reqVO.getContractId()));
}
default List<ExtContractDO> selectLocalDateTime(Long contractId) {
return selectList(new LambdaQueryWrapperX<ExtContractDO>()
.eqIfPresent(ExtContractDO::getContractId,contractId)
.orderByDesc(ExtContractDO::getReminderTime));
}
}

25
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractService.java
View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.cms.service.contract;
import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDetailDO;
import jakarta.validation.*;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -52,19 +53,6 @@ public interface ContractService {
*/
PageResult<ContractRespVO> getContractPage(ContractPageReqVO pageReqVO);
/**
* 通过id获得暂定结算金额
* @param id 合同编号
* @return
*/
BigDecimal getProvisionalSettlementById(Long id);
/**
* 通过输入的合同获得暂定结算金额
* @param contractSaveReqVO
* @return
*/
BigDecimal getProvisionalSettlement(ContractSaveReqVO contractSaveReqVO);
/**
* 判断合同是否存在
@@ -74,17 +62,12 @@ public interface ContractService {
/**
* 查询流程
* 得到合同detail信息
* @param id 合同id
*/
ContractProcessInstanceRespVO getContractProcess(Long id);
/**
* 查询合同历史流程
* @param projectId 项目id
* @return
*/
List<ContractProcessInstanceRespVO> getHistoryContractProcess(Long projectId);
ContractDetailDO getContractDetail(Long id);

267
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java
View File

@@ -1,15 +1,13 @@
package cn.iocoder.yudao.module.cms.service.contract;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceRespDTO;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmTaskRespDTO;
import cn.iocoder.yudao.module.cms.dal.dataobject.contractHistory.ContractHistoryDO;
import cn.hutool.core.bean.BeanUtil;
import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDetailDO;
import cn.iocoder.yudao.module.cms.dal.mysql.contract.ContractMapper;
import cn.iocoder.yudao.module.cms.dal.mysql.contractHistory.ContractHistoryMapper;
import cn.iocoder.yudao.module.pms.api.project.ProjectApi;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
import cn.iocoder.yudao.module.cms.service.extContract.ExtContractService;
import cn.iocoder.yudao.module.pms.api.projectschedule.ProjectScheduleApi;
import cn.iocoder.yudao.module.pms.api.projectschedule.dto.ProjectScheduleDetailDTO;
import cn.iocoder.yudao.module.pms.api.projecttracking.ProjectTrackingApi;
import cn.iocoder.yudao.module.pms.api.projecttracking.dto.ProjectTrackingDetailDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
@@ -20,10 +18,8 @@ import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
@@ -38,130 +34,49 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_NOT_E
@Validated
public class ContractServiceImpl implements ContractService {
/**
* 合同立项审批流程定义
*/
public static final String PROCESS_KEY = "contract_init";
/**
* 版本
*/
public static String VERSION = "1";
@Resource
private ContractMapper contractMapper;
@Resource
private ProjectApi projectApi;
@Resource
private AdminUserApi adminUserApi;
@Resource
private BpmProcessInstanceApi processInstanceApi;
private ProjectScheduleApi projectScheduleApi;
@Resource
private ContractHistoryMapper contractHistoryMapper;
private ProjectTrackingApi projectTrackingApi;
@Resource
private ExtContractService extContractService;
@Override
public Long createContract(Long loginUserId, ContractSaveReqVO createReqVO) {
if (loginUserId == null) {
throw exception(PARAM_NOT_EXISTS);
}
String userName = adminUserApi.getUser(loginUserId).getNickname();
if (userName == null) {
throw exception(USER_NOT_EXISTS);
}
//校验,项目是否存在
Long projectId = createReqVO.getProjectId();
projectApi.validProjectExist(projectId);
//校验联表的字段是否和所联系的表内容相同
ProjectRespDTO project = projectApi.getProject(projectId);
ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId);
//todo 待提取
String code = createReqVO.getCode();
String trackingDep = createReqVO.getTrackingDep();
String projectManager = createReqVO.getProjectManager();
String drawingCompany = createReqVO.getDrawingCompany();
BigDecimal expectedContractAmount = createReqVO.getExpectedContractAmount();
BigDecimal provisionalSettlement = createReqVO.getProvisionalSettlement();
//LocalDateTime reminderTime = createReqVO.getReminderTime();
if (!project.getCode().equals(code)) {
throw exception(PARAM_ERROR);
}
if (!projectDetail.getTrackingDepName().equals(trackingDep)) {
throw exception(PARAM_ERROR);
}
if (!projectDetail.getProjectManagerName().equals(projectManager)) {
throw exception(PARAM_ERROR);
}
if (!project.getDrawingCompany().equals(drawingCompany)) {
throw exception(PARAM_ERROR);
}
if (!Objects.equals(project.getContractAmount(), expectedContractAmount)) {
throw exception(PARAM_ERROR);
}
if (!Objects.equals(provisionalSettlement, getProvisionalSettlement(createReqVO))) {
throw exception(PARAM_ERROR);
}
ContractDO contract = BeanUtils.toBean(createReqVO, ContractDO.class);
ContractRespVO contractResp = BeanUtils.toBean(contract, ContractRespVO.class);
contract.setCreator(userName);
contract.setUpdater(userName);
//判断该合同是否已经存在,比较各个字段值是否完全一样
//得到所有的合同？逐个比较？
List<ContractDO> contractList = contractMapper.selectList("project_id", projectId);
List<ContractRespVO> respVOList = BeanUtils.toBean(contractList, ContractRespVO.class);
for (ContractRespVO respVO : respVOList) {
if (respVO.equals(contractResp)) {
String name = createReqVO.getName();
String trimName = name.trim();
List<ContractDO> projectList = contractMapper.selectList("project_id", projectId);
for (ContractDO contractDO : projectList) {
if (contractDO.getName().equals(trimName)){
throw exception(CONTRACT_ALREADY_EXISTS);
}
}
ContractDO contract = BeanUtils.toBean(createReqVO, ContractDO.class);
contract.setCreator(userName);
contract.setUpdater(userName);
contractMapper.insert(contract);
Long contractId = contract.getId();
ContractHistoryDO contractHistory = BeanUtils.toBean(contract, ContractHistoryDO.class);
// 启动流程，同时写入历史合同
if (createReqVO.getId() == null) {
String processInstanceId = processInstanceApi.createProcessInstance(loginUserId,
new BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(PROCESS_KEY).setBusinessKey(String.valueOf(contractId)));
// 写入工作流编号
contractHistory.setProcessInstanceId(processInstanceId);
contractHistory.setContractId(contractId);
Long count = contractHistoryMapper.selectCount("project_id", projectId);
if (count < 1) {
contractHistory.setVersion(VERSION);
} else {
contractHistory.setVersion(String.valueOf(count + 1));
}
contractHistory.setProcessStatus("0");
contractHistoryMapper.insert(contractHistory);
}
//返回
return contract.getId();
}
@@ -170,7 +85,7 @@ public class ContractServiceImpl implements ContractService {
public void updateContract(Long loginUserId, ContractSaveReqVO updateReqVO) {
//校验
validateContractExists(updateReqVO.getId());
projectApi.validProjectExist(updateReqVO.getProjectId());
projectTrackingApi.validateProjectExists(updateReqVO.getProjectId());
// 更新
ContractDO updateObj = BeanUtils.toBean(updateReqVO, ContractDO.class);
String userName = adminUserApi.getUser(loginUserId).getNickname();
@@ -203,100 +118,25 @@ public class ContractServiceImpl implements ContractService {
}
Long projectId = contractDO.getProjectId();
if (projectId == null) {
throw exception(PROJECT_NOT_EXISTS);
}
ProjectScheduleDetailDTO projectScheduleDetail = projectScheduleApi.getProjectScheduleDetail(projectId);
ContractRespVO contractRespVO = BeanUtils.toBean(contractDO, ContractRespVO.class);
// 需要联表查询
// 1.项目编号 pms_project 直接 √
// 2.主控部门(跟踪部门) pms_project找到的是id 需要联表 √
// 3.项目经理 pms_project找到的是id 需要联表 √
// 4.出图公司 pms_project 直接 √
// 5.预计合同金额 pms_project 直接 √
// 6.合同商议提示 √ 外部合同表里
// 7.暂定结算数 √
ProjectRespDTO project = projectApi.getProject(projectId);
contractRespVO.setCode(project.getCode());
contractRespVO.setDrawingCompany(project.getDrawingCompany());
contractRespVO.setExpectedContractAmount(project.getContractAmount());
ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId);
contractRespVO.setTrackingDep(projectDetail.getTrackingDepName());
contractRespVO.setProjectManager(projectDetail.getProjectManagerName());
//分包合同商议提示 TODO 待优化
// ExtContractDO extContractDO = extContractMapper.selectOne("project_id", projectId);
// LocalDateTime reminderTime = extContractDO.getReminderTime();
contractRespVO.setReminderTime(null);
//暂定结算数
BigDecimal provisionalSettlement = getProvisionalSettlementById(id);
contractRespVO.setProvisionalSettlement(provisionalSettlement);
contractRespVO.setProjectManager(projectScheduleDetail.getProjectManager());
return contractRespVO;
}
@Override
public PageResult<ContractRespVO> getContractPage(ContractPageReqVO 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<ContractDO> contractDOPageResult = contractMapper.selectPage(pageReqVO);
List<ContractDO> contractDOList = contractDOPageResult.getList();
List<ContractRespVO> contractRespVOList = new ArrayList<>();
for (ContractDO contractDO : contractDOList) {
Long id = contractDO.getId();
ContractRespVO contract = getContract(id);
contractRespVOList.add(contract);
}
PageResult<ContractRespVO> pageResult = new PageResult<>();
pageResult.setList(contractRespVOList);
return pageResult;
return null;
}
@Override
public BigDecimal getProvisionalSettlementById(Long id) {
ContractDO contractDO = contractMapper.selectById(id);
String type = contractDO.getCountType();
BigDecimal amount = contractDO.getAmount();
BigDecimal bigDecimal = new BigDecimal(String.valueOf(amount));
BigDecimal mul = new BigDecimal("0.85");
BigDecimal res = null;
if ("费率合同".equals(type)) {
res = bigDecimal.multiply(mul);
} else if ("总价合同".equals(type)) {
res = amount;
}
return res;
}
@Override
public BigDecimal getProvisionalSettlement(ContractSaveReqVO contractSaveReqVO) {
String type = contractSaveReqVO.getCountType();
BigDecimal amount = contractSaveReqVO.getAmount();
BigDecimal bigDecimal = new BigDecimal(String.valueOf(amount));
BigDecimal mul = new BigDecimal("0.85");
BigDecimal res = null;
if ("费率合同".equals(type)) {
res = bigDecimal.multiply(mul);
} else if ("总价合同".equals(type)) {
res = amount;
}
return res;
}
@Override
@@ -307,46 +147,27 @@ public class ContractServiceImpl implements ContractService {
}
@Override
public ContractProcessInstanceRespVO getContractProcess(Long id) {
validateContractExists(id);
//去历史里面找
ContractHistoryDO contractHistory = contractHistoryMapper.selectOne("contract_id", id);
if (contractHistory == null) {
public ContractDetailDO getContractDetail(Long id) {
ContractDetailDO contractDetailDO = new ContractDetailDO();
ContractDO contractDO = contractMapper.selectById(id);
//校验
if (contractDO == null) {
throw exception(CONTRACT_NOT_EXISTS);
}
//拿到历史之后 找到process_instance_id 和 status
String processInstanceId = contractHistory.getProcessInstanceId();
String processStatus = contractHistory.getProcessStatus();
//与当前流程里的进行比较
String status = String.valueOf(processInstanceApi.getProcessInstance(processInstanceId).getStatus());
Long projectId = contractDO.getProjectId();
projectTrackingApi.validateProjectExists(projectId);
ProjectScheduleDetailDTO projectScheduleDetail = projectScheduleApi.getProjectScheduleDetail(projectId);
ProjectTrackingDetailDTO projectTracking = projectTrackingApi.getProjectTracking(projectId);
LocalDateTime localDateTime = extContractService.getLocalDateTime(id);
contractDetailDO.setReminderTime(localDateTime);
BeanUtil.copyProperties(contractDO, contractDetailDO);
BeanUtil.copyProperties(projectTracking,contractDetailDO);
BeanUtil.copyProperties(projectScheduleDetail,contractDetailDO);
//如果不相等
if (!status.equals(processStatus)){
//更新当前合同对应历史表里面的状态
contractHistory.setProcessStatus(status);
contractHistoryMapper.updateById(contractHistory);
}
//返回给前端必要的数据 当前流程里面对应的数据
BpmProcessInstanceRespDTO processInstance = processInstanceApi.getProcessInstance(processInstanceId);
List<BpmTaskRespDTO> tasks = processInstanceApi.getTask(processInstanceId);
List<BpmProcessInstanceRespDTO.Task> taskList = BeanUtils.toBean(tasks, BpmProcessInstanceRespDTO.Task.class);
processInstance.setTasks(taskList);
return BeanUtils.toBean(processInstance, ContractProcessInstanceRespVO.class);
return contractDetailDO;
}
@Override
public List<ContractProcessInstanceRespVO> getHistoryContractProcess(Long projectId) {
List<ContractHistoryDO> projectList = contractHistoryMapper.selectList("project_id", projectId);
List<ContractProcessInstanceRespVO> contractProcessInstanceRespVOList = new ArrayList<>();
for (ContractHistoryDO contractHistoryDO : projectList) {
Long id = contractHistoryDO.getId();
ContractProcessInstanceRespVO contractProcess = getContractProcess(id);
contractProcessInstanceRespVOList.add(contractProcess);
}
return contractProcessInstanceRespVOList;
}
}

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

@@ -1,12 +1,6 @@
package cn.iocoder.yudao.module.cms.service.contractHistory;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractRespVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDO;
import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum;
import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum;
import cn.iocoder.yudao.module.cms.service.contract.ContractService;
import cn.iocoder.yudao.module.pms.api.project.ProjectApi;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
@@ -17,7 +11,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.cms.dal.mysql.contractHistory.ContractHistoryMapper;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +25,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_NOT_E
*/
@Service
@Validated
public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.service.contractHistory.ContractHistoryService {
public class ContractHistoryServiceImpl implements ContractHistoryService {
@Resource
private ContractHistoryMapper contractHistoryMapper;
@@ -40,11 +33,6 @@ public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.s
@Resource
private AdminUserApi adminUserApi;
@Resource
private ProjectApi projectApi;
@Resource
private ContractService contractService;
@@ -57,10 +45,6 @@ public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.s
throw exception(USER_NOT_EXISTS);
}
Long projectId = updateReqVO.getProjectId();
ProjectRespDTO project = projectApi.getProject(projectId);
if (project == null){
throw exception(PROJECT_NOT_EXISTS);
}
// 更新
ContractHistoryDO updateObj = BeanUtils.toBean(updateReqVO, ContractHistoryDO.class);
String userName = adminUserApi.getUser(loginUserId).getNickname();
@@ -97,14 +81,6 @@ public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.s
// 6.分包合同商议提示 √
// 7.暂定结算数 √
// TODO 枚举优化
ProjectRespDTO project = projectApi.getProject(projectId);
contractHistoryRespVO.setCode(project.getCode());
contractHistoryRespVO.setDrawingCompany(project.getDrawingCompany());
contractHistoryRespVO.setExpectedContractAmount(project.getContractAmount());
ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId);
contractHistoryRespVO.setTrackingDep(projectDetail.getTrackingDepName());
contractHistoryRespVO.setProjectManager(projectDetail.getProjectManagerName());
contractHistoryRespVO.setType(ContractTypeEnum.getNoByCode(contractHistoryRespVO.getType()));
contractHistoryRespVO.setStatus(ContractStatusEnum.getNoByCode(contractHistoryRespVO.getStatus()));
@@ -117,8 +93,7 @@ public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.s
contractHistoryRespVO.setReminderTime(null);
//暂定结算数
BigDecimal provisionalSettlement =contractService.getProvisionalSettlementById(id);
contractHistoryRespVO.setProvisionalSettlement(provisionalSettlement);
return contractHistoryRespVO;
@@ -134,10 +109,6 @@ public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.s
}
Long projectId = pageReqVO.getProjectId();
ProjectRespDTO project = projectApi.getProject(projectId);
if (project == null) {
throw exception(PROJECT_NOT_EXISTS);
}
PageResult<ContractHistoryDO> contractHistoryDOPageResult = contractHistoryMapper.selectPage(pageReqVO);
List<ContractHistoryDO> pageResultList = contractHistoryDOPageResult.getList();

30
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractService.java
View File

@@ -1,14 +1,13 @@
package cn.iocoder.yudao.module.cms.service.extContract;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractSaveReqVO;
import jakarta.validation.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -57,31 +56,10 @@ public interface ExtContractService {
PageResult<ExtContractRespVO> getExtContractPage(ExtContractPageReqVO pageReqVO);
/**
* 合同总金额
* @param id 通过id计算
* 得到合同商议时间
* @param contractId 合同id
* @return
*/
BigDecimal getContractAmountById(Long id);
/**
* 合同总金额
* @param createReqVO 通过对象计算
* @return
*/
BigDecimal getContractAmount(ExtContractSaveReqVO createReqVO);
/**
* 查询流程
* @param id 合同id
*/
ContractProcessInstanceRespVO getContractProcess(Long id);
/**
* 查询历史外部合同流程
* @param projectId 项目id
* @return
*/
List<ContractProcessInstanceRespVO> getHistoryContractProcess(Long projectId);
LocalDateTime getLocalDateTime(Long contractId);
}

113
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractServiceImpl.java
View File

@@ -4,7 +4,6 @@ import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceRespDTO;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmTaskRespDTO;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractSaveReqVO;
@@ -16,9 +15,6 @@ import cn.iocoder.yudao.module.cms.dal.mysql.extcontracthistory.ExtContractHisto
import cn.iocoder.yudao.module.cms.enums.ChargingStandardEnum;
import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum;
import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum;
import cn.iocoder.yudao.module.pms.api.project.ProjectApi;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
@@ -27,9 +23,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
@@ -57,8 +53,6 @@ public class ExtContractServiceImpl implements ExtContractService {
@Resource
private ExtContractMapper extContractMapper;
@Resource
private ProjectApi projectApi;
@Resource
private CustomerCompanyMapper customerCompanyMapper;
@@ -93,12 +87,6 @@ public class ExtContractServiceImpl implements ExtContractService {
ExtContractDO extContract = BeanUtils.toBean(createReqVO, ExtContractDO.class);
//校验
Long projectId = extContract.getProjectId();
projectApi.validProjectExist(projectId);
//校验联表的字段是否和所联系的表内容相同
ProjectRespDTO project = projectApi.getProject(projectId);
ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId);
// 需要联表查询
// 1.项目编号 pms_project 直接 √
@@ -119,24 +107,6 @@ public class ExtContractServiceImpl implements ExtContractService {
if (!project.getCode().equals(code)){
throw exception(PARAM_ERROR);
}
if (!projectDetail.getTrackingDepName().equals(trackingDep)){
throw exception(PARAM_ERROR);
}
if (!projectDetail.getProjectManagerName().equals(projectManager)){
throw exception(PARAM_ERROR);
}
// String name = customerCompanyMapper.selectById(createReqVO.getCustomerCompanyId()).getName();
// if (!name.equals(customerCompanyName)){
// throw exception(PARAM_ERROR);
// }
if (!Objects.equals(amount, getContractAmount(createReqVO))){
throw exception(PARAM_ERROR);
}
ExtContractDO extContractDO = BeanUtils.toBean(createReqVO, ExtContractDO.class);
ExtContractRespVO contractRespVO = BeanUtils.toBean(extContractDO, ExtContractRespVO.class);
@@ -198,7 +168,6 @@ public class ExtContractServiceImpl implements ExtContractService {
}
validateExtContractExists(updateReqVO.getId());
projectApi.validProjectExist(updateReqVO.getProjectId());
String userName = adminUserApi.getUser(loginUserId).getNickname();
if (userName == null) {
throw exception(USER_NOT_EXISTS);
@@ -238,21 +207,11 @@ public class ExtContractServiceImpl implements ExtContractService {
}
Long projectId = extContractDO.getProjectId();
if (projectApi.getProject(projectId) == null) {
throw exception(PROJECT_NOT_EXISTS);
}
//Long customerCompanyId = extContractDO.getCustomerCompanyId();
ExtContractRespVO extContractRespVO = BeanUtils.toBean(extContractDO, ExtContractRespVO.class);
ProjectRespDTO project = projectApi.getProject(projectId);
extContractRespVO.setCode(project.getCode());
ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId);
extContractRespVO.setTrackingDep(projectDetail.getTrackingDepName());
extContractRespVO.setProjectManager(projectDetail.getProjectManagerName());
//用客户公司id查询
//CustomerCompanyDO customerCompanyDO = customerCompanyMapper.selectById(customerCompanyId);
//String name = customerCompanyDO.getName();
@@ -261,8 +220,6 @@ public class ExtContractServiceImpl implements ExtContractService {
//合同总金额
BigDecimal contractAmount = getContractAmountById(id);
extContractRespVO.setAmount(contractAmount);
//合同商议提示 // TODO 待优化
extContractRespVO.setExReminderTime(null);
@@ -299,69 +256,9 @@ public class ExtContractServiceImpl implements ExtContractService {
}
@Override
public BigDecimal getContractAmountById(Long id) {
//前期+设计+地勘+其他+检测
ExtContractDO extContract = extContractMapper.selectById(id);
BigDecimal preAmount = new BigDecimal(String.valueOf(extContract.getPreAmount()));
BigDecimal designFee = new BigDecimal(String.valueOf(extContract.getDesignFee()));
BigDecimal surveyFees = new BigDecimal(String.valueOf(extContract.getSurveyFees()));
BigDecimal testingFee = new BigDecimal(String.valueOf(extContract.getTestingFee()));
//BigDecimal other = new BigDecimal(extContract.getOtherFee());
//return preAmount.add(designFee).add(surveyFees).add(testingFee).add(other);
return null;
}
@Override
public BigDecimal getContractAmount(ExtContractSaveReqVO extContractSaveReqVO) {
//前期+设计+地勘+其他+检测
BigDecimal preAmount = new BigDecimal(String.valueOf(extContractSaveReqVO.getPreAmount()));
BigDecimal designFee = new BigDecimal(String.valueOf(extContractSaveReqVO.getDesignFee()));
BigDecimal surveyFees = new BigDecimal(String.valueOf(extContractSaveReqVO.getSurveyFees()));
BigDecimal testingFee = new BigDecimal(String.valueOf(extContractSaveReqVO.getTestingFee()));
//BigDecimal other = new BigDecimal(extContractSaveReqVO.getOtherFee());
return null;
}
@Override
public ContractProcessInstanceRespVO getContractProcess(Long id) {
validateExtContractExists(id);
//去历史里面找
ExtContractHistoryDO extContractHistoryDO = extContractHistoryMapper.selectOne("ext_contract_id", id);
if (extContractHistoryDO == null) {
throw exception(CONTRACT_NOT_EXISTS);
}
//拿到历史之后 找到process_instance_id 和 status
String processInstanceId = extContractHistoryDO.getProcessInstanceId();
String processStatus = extContractHistoryDO.getProcessStatus();
//与当前流程里的进行比较
String status = String.valueOf(processInstanceApi.getProcessInstance(processInstanceId).getStatus());
//如果不相等
if (!status.equals(processStatus)){
//更新当前合同对应历史表里面的状态
extContractHistoryDO.setProcessStatus(status);
extContractHistoryMapper.updateById(extContractHistoryDO);
}
//返回给前端必要的数据 当前流程里面对应的数据
BpmProcessInstanceRespDTO processInstance = processInstanceApi.getProcessInstance(processInstanceId);
List<BpmTaskRespDTO> tasks = processInstanceApi.getTask(processInstanceId);
List<BpmProcessInstanceRespDTO.Task> taskList = BeanUtils.toBean(tasks, BpmProcessInstanceRespDTO.Task.class);
processInstance.setTasks(taskList);
return BeanUtils.toBean(processInstance, ContractProcessInstanceRespVO.class);
}
@Override
public List<ContractProcessInstanceRespVO> getHistoryContractProcess(Long projectId) {
List<ExtContractHistoryDO> contractHistoryList = extContractHistoryMapper.selectList("project_id", projectId);
List<ContractProcessInstanceRespVO> contractProcessInstanceRespVOList = new ArrayList<>();
for (ExtContractHistoryDO contractHistory : contractHistoryList) {
Long id = contractHistory.getId();
ContractProcessInstanceRespVO contractProcess = getContractProcess(id);
contractProcessInstanceRespVOList.add(contractProcess);
}
return contractProcessInstanceRespVOList;
public LocalDateTime getLocalDateTime(Long contractId) {
List<ExtContractDO> extContractDOS = extContractMapper.selectLocalDateTime(contractId);
return extContractDOS.get(0).getReminderTime();
}

57
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontracthistory/ExtContractHistoryServiceImpl.java
View File

@@ -1,20 +1,11 @@
package cn.iocoder.yudao.module.cms.service.extcontracthistory;
import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
import cn.iocoder.yudao.module.cms.dal.mysql.customerCompany.CustomerCompanyMapper;
import cn.iocoder.yudao.module.cms.enums.ChargingStandardEnum;
import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum;
import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum;
import cn.iocoder.yudao.module.cms.service.extContract.ExtContractService;
import cn.iocoder.yudao.module.pms.api.project.ProjectApi;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -41,14 +32,10 @@ public class ExtContractHistoryServiceImpl implements ExtContractHistoryService
@Resource
private ExtContractHistoryMapper extContractHistoryMapper;
@Resource
private ProjectApi projectApi;
@Resource
private AdminUserApi adminUserApi;
@Resource
private CustomerCompanyMapper customerCompanyMapper;
@Resource
private ExtContractService extContractService;
@@ -61,7 +48,6 @@ public class ExtContractHistoryServiceImpl implements ExtContractHistoryService
}
validateExtContractHistoryExists(updateReqVO.getId());
projectApi.validProjectExist(updateReqVO.getProjectId());
String userName = adminUserApi.getUser(loginUserId).getNickname();
if (userName == null) {
throw exception(USER_NOT_EXISTS);
@@ -88,43 +74,10 @@ public class ExtContractHistoryServiceImpl implements ExtContractHistoryService
}
Long projectId = extContractHistoryDO.getProjectId();
if (projectApi.getProject(projectId) == null) {
throw exception(PROJECT_NOT_EXISTS);
}
Long customerCompanyId = extContractHistoryDO.getCustomerCompanyId();
ExtContractHistoryRespVO HistoryResp = BeanUtils.toBean(extContractHistoryDO, ExtContractHistoryRespVO.class);
ProjectRespDTO project = projectApi.getProject(projectId);
HistoryResp.setCode(project.getCode());
ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId);
HistoryResp.setTrackingDep(projectDetail.getTrackingDepName());
HistoryResp.setProjectManager(projectDetail.getProjectManagerName());
//用客户公司id查询
CustomerCompanyDO customerCompanyDO = customerCompanyMapper.selectById(customerCompanyId);
String name = customerCompanyDO.getName();
HistoryResp.setCustomerCompanyName(name);
// TODO 枚举优化
//合同总金额
BigDecimal contractAmount = extContractService.getContractAmountById(id);
HistoryResp.setAmount(contractAmount);
//合同商议提示 // TODO 待优化
HistoryResp.setExReminderTime(null);
HistoryResp.setType(ContractTypeEnum.getNoByCode(HistoryResp.getType()));
HistoryResp.setStatus(ContractStatusEnum.getNoByCode(HistoryResp.getStatus()));
HistoryResp.setCountType(ContractStatusEnum.getNoByCode(HistoryResp.getCountType()));
HistoryResp.setSource(ContractStatusEnum.getNoByCode(HistoryResp.getSource()));
HistoryResp.setChargingStandard(ChargingStandardEnum.getNoByCode(HistoryResp.getChargingStandard()));
return HistoryResp;
return null;
}
@Override
@@ -134,12 +87,6 @@ public class ExtContractHistoryServiceImpl implements ExtContractHistoryService
throw exception(PARAM_NOT_EXISTS);
}
Long projectId = pageReqVO.getProjectId();
ProjectRespDTO project = projectApi.getProject(projectId);
if (project == null) {
throw exception(PROJECT_NOT_EXISTS);
}
PageResult<ExtContractHistoryDO> extContractHistoryPageResult = extContractHistoryMapper.selectPage(pageReqVO);
List<ExtContractHistoryDO> pageResultList = extContractHistoryPageResult.getList();
List<ExtContractHistoryRespVO> contractHistoryRespVOS = new ArrayList<>();

15
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractService.java
View File

@@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.cms.service.outscontract;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractSaveReqVO;
@@ -54,19 +53,5 @@ public interface OutsContractService {
*/
PageResult<OutsContractRespVO> getOutsContractPage(OutsContractPageReqVO pageReqVO);
/**
* 查询流程
* @param id 合同id
*/
ContractProcessInstanceRespVO getContractProcess(Long id);
/**
* 查询历史外包合同流程
* @param projectId 项目id
* @return
*/
List<ContractProcessInstanceRespVO> getHistoryContractProcess(Long projectId);
}

56
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java
View File

@@ -4,9 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceRespDTO;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmTaskRespDTO;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractRespVO;
@@ -17,8 +14,6 @@ import cn.iocoder.yudao.module.cms.dal.mysql.outscontract.OutsContractMapper;
import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHistoryMapper;
import cn.iocoder.yudao.module.cms.enums.*;
import cn.iocoder.yudao.module.cms.service.contract.ContractService;
import cn.iocoder.yudao.module.pms.api.project.ProjectApi;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -57,9 +52,6 @@ public class OutsContractServiceImpl implements OutsContractService {
@Resource
private ContractService contractService;
@Resource
private ProjectApi projectApi;
@Resource
private AdminUserApi adminUserApi;
@@ -87,7 +79,6 @@ public class OutsContractServiceImpl implements OutsContractService {
OutsContractDO outsContractDO = BeanUtils.toBean(createReqVO, OutsContractDO.class);
//校验
Long projectId = outsContractDO.getProjectId();
projectApi.validProjectExist(projectId);
//校验联表的字段是否和所联系的表内容相同
@@ -236,11 +227,6 @@ public class OutsContractServiceImpl implements OutsContractService {
throw exception(PARAM_NOT_EXISTS);
}
Long projectId = pageReqVO.getProjectId();
ProjectRespDTO project = projectApi.getProject(projectId);
if (project == null) {
throw exception(PROJECT_NOT_EXISTS);
}
PageResult<OutsContractDO> outsContractDOPageResult = outsContractMapper.selectPage(pageReqVO);
List<OutsContractDO> outsContractDOList = outsContractDOPageResult.getList();
@@ -258,48 +244,6 @@ public class OutsContractServiceImpl implements OutsContractService {
return pageResult;
}
@Override
public ContractProcessInstanceRespVO getContractProcess(Long id) {
validateOutsContractExists(id);
//去历史里面找
OutsContractHistoryDO outsContractHistory = outsContractHistoryMapper.selectOne("outs_contract_id", id);
if (outsContractHistory == null) {
throw exception(CONTRACT_NOT_EXISTS);
}
//拿到历史之后 找到process_instance_id 和 status
String processInstanceId = outsContractHistory.getProcessInstanceId();
String processStatus = outsContractHistory.getProcessStatus();
//与当前流程里的进行比较
String status = String.valueOf(processInstanceApi.getProcessInstance(processInstanceId).getStatus());
//如果不相等
if (!status.equals(processStatus)){
//更新当前合同对应历史表里面的状态
outsContractHistory.setProcessStatus(status);
outsContractHistoryMapper.updateById(outsContractHistory);
}
//返回给前端必要的数据 当前流程里面对应的数据
BpmProcessInstanceRespDTO processInstance = processInstanceApi.getProcessInstance(processInstanceId);
List<BpmTaskRespDTO> tasks = processInstanceApi.getTask(processInstanceId);
List<BpmProcessInstanceRespDTO.Task> taskList = BeanUtils.toBean(tasks, BpmProcessInstanceRespDTO.Task.class);
processInstance.setTasks(taskList);
return BeanUtils.toBean(processInstance, ContractProcessInstanceRespVO.class);
}
@Override
public List<ContractProcessInstanceRespVO> getHistoryContractProcess(Long projectId) {
List<OutsContractHistoryDO> outsContracts= outsContractHistoryMapper.selectList("project_id", projectId);
List<ContractProcessInstanceRespVO> contractProcessInstanceRespVOList = new ArrayList<>();
for (OutsContractHistoryDO outsContract : outsContracts) {
Long id = outsContract.getId();
ContractProcessInstanceRespVO contractProcess = getContractProcess(id);
contractProcessInstanceRespVOList.add(contractProcess);
}
return contractProcessInstanceRespVOList;
}
private void validateOutsContractExists(Long id) {
if (outsContractMapper.selectById(id) == null) {

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

@@ -11,8 +11,6 @@ import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHis
import cn.iocoder.yudao.module.cms.enums.CountTypeEnum;
import cn.iocoder.yudao.module.cms.enums.OutsContractMajorEnum;
import cn.iocoder.yudao.module.cms.service.contract.ContractService;
import cn.iocoder.yudao.module.pms.api.project.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;
@@ -22,7 +20,6 @@ import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.PROJECT_NOT_EXISTS;
/**
* 外包合同历史 Service 实现类
@@ -36,8 +33,6 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
@Resource
private OutsContractHistoryMapper outsContractHistoryMapper;
@Resource
private ProjectApi projectApi;
@Resource
private ContractService contractService;
@@ -85,11 +80,6 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
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();