[fix] 优化外部合同管理

yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java

@@ -43,6 +43,8 @@ public interface ErrorCodeConstants {
     // ========== 外部合同信息 2_026_000_000 ==========
     ErrorCode EXT_CONTRACT_NOT_EXISTS = new ErrorCode(2_026_000_000, "外部合同不存在");
 
+    ErrorCode EXT_CONTRACT_EXISTS = new ErrorCode(2_026_000_000, "外部合同已经存在");
+
     // ========== 历史外部合同信息 2_027_000_000 ==========
     ErrorCode EXT_CONTRACT_HISTORY_NOT_EXISTS = new ErrorCode(2_027_000_000, "历史外部合同不存在");
 

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/ContractController.java

@@ -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);
-    }
 
 }

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

@@ -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;

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

@@ -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;
-
-    }
-
-}

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

@@ -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.*;
 
@@ -27,9 +29,6 @@ public class ContractRespVO {
     @ExcelProperty("项目id")
     private Long projectId;
 
-    @Schema(description = "外部合同id", example = "32057")
-    @ExcelProperty("外部合同id")
-    private Long extContractId;
 
 
 
@@ -113,7 +112,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 +144,7 @@ public class ContractRespVO {
 
     @Schema(description = "审核文件url", example = "https://www.iocoder.cn")
     @ExcelProperty("审核文件url")
-    private String reviewFileUrl;
+    private List<FileDTO> reviewFileUrl;
 
     @Schema(description = "最后编辑人")
     @ExcelProperty("最后编辑人")

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

@@ -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
@@ -23,11 +25,7 @@ public class ContractSaveReqVO {
     @ExcelProperty("项目id")
     private Long projectId;
 
-    @Schema(description = "外部合同id", example = "32057")
-    @ExcelProperty("外部合同id")
-    private Long extContractId;
 
-    //
 
     @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
     @ExcelProperty("项目编号")
@@ -109,7 +107,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 +139,7 @@ public class ContractSaveReqVO {
 
     @Schema(description = "审核文件url", example = "https://www.iocoder.cn")
     @ExcelProperty("审核文件url")
-    private String reviewFileUrl;
+    private List<FileDTO> reviewFileUrl;
 
     @Schema(description = "最后编辑人")
     @ExcelProperty("最后编辑人")

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

@@ -1,9 +1,10 @@
 package cn.iocoder.yudao.module.cms.controller.admin.extContract;
 
-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.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 cn.iocoder.yudao.module.cms.dal.dataobject.extcontract.ExtContractDetailDO;
 import cn.iocoder.yudao.module.cms.service.extContract.ExtContractService;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -69,8 +70,13 @@ public class ExtContractController {
     @Parameter(name = "id", description = "外部合同编号", required = true)
     @PreAuthorize("@ss.hasPermission('cms-ext:ext-contract:query')")
     public CommonResult<ExtContractRespVO> getExtContract(@RequestParam("id") Long id) {
-        ExtContractRespVO extContract = extContractService.getExtContract(id);
+        ExtContractDetailDO extContractDetailDO = extContractService.getContractDetail(id);
-        return success(extContract);
+        ExtContractRespVO extContractRespVO = new ExtContractRespVO();
+        org.springframework.beans.BeanUtils.copyProperties(extContractDetailDO, extContractRespVO, "contractFileUrl", "reviewFileUrl");
+        extContractRespVO.setReviewFileUrl(FileUtils.covertJSONStringToFile(extContractDetailDO.getReviewFileUrl()));
+        extContractRespVO.setContractFileUrl(FileUtils.covertJSONStringToFile(extContractDetailDO.getContractFileUrl()));
+
+        return success(extContractRespVO);
     }
 
     @GetMapping("/page")
@@ -94,22 +100,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);
-    }
-
 }

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractPageReqVO.java

@@ -20,20 +20,10 @@ public class ExtContractPageReqVO extends PageParam {
     @Schema(description = "项目id", example = "30598")
     private Long projectId;
 
-    @Schema(description = "合同名称", example = "芋艿")
-    private String name;
-
     @Schema(description = "合同类型", example = "1")
     @DictFormat(DictTypeConstants.CONTRACT_TYPE)
     private String type;
 
-    @Schema(description = "客户公司id", example = "25191")
-    private Long customerCompanyId;
-
-    @Schema(description = "合同进展")
-    private String progress;
-
-
     @Schema(description = "状态", example = "2")
     @DictFormat(DictTypeConstants.CONTRACT_STATUS)
     private String status;

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.cms.controller.admin.extContract.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;
 import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
@@ -7,6 +8,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 外部合同 Response VO")
@@ -35,7 +38,7 @@ public class ExtContractRespVO {
 
     @Schema(description = "客户名称")
     @ExcelProperty("客户名称")
-    private String customerCompanyName;
+    private String constructionSide;
 
     @Schema(description = "主控部门", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产一部")
     @ExcelProperty("主控部门")
@@ -116,9 +119,9 @@ public class ExtContractRespVO {
     @ExcelProperty("备注")
     private String remark;
 
-    @Schema(description = "合同附件url", example = "https://www.iocoder.cn")
+    @Schema(description = "合同附件url")
     @ExcelProperty("合同附件url")
-    private String contractFileUrl;
+    private List<FileDTO> contractFileUrl;
 
     @Schema(description = "建安费")
     @ExcelProperty("建安费")
@@ -154,9 +157,9 @@ public class ExtContractRespVO {
     @ExcelProperty("审定金额")
     private BigDecimal approvedAmount;
 
-    @Schema(description = "审核文件url", example = "https://www.iocoder.cn")
+    @Schema(description = "审核文件url")
     @ExcelProperty("审核文件url")
-    private String reviewFileUrl;
+    private List<FileDTO> reviewFileUrl;
 
     @Schema(description = "最后编辑人")
     @ExcelProperty("最后编辑人")

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractSaveReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.cms.controller.admin.extContract.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;
 import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
@@ -9,6 +10,7 @@ import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 外部合同新增/修改 Request VO")
 @Data
@@ -29,29 +31,6 @@ public class ExtContractSaveReqVO {
 
 
 
-    @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
-    @ExcelProperty("项目编号")
-    private String code;
-
-    @Schema(description = "客户名称")
-    @ExcelProperty("客户名称")
-    private String customerCompanyName;
-
-    @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 LocalDateTime exReminderTime;
-
-
-
-
 
     @Schema(description = "合同名称", example = "赵六")
     @ExcelProperty("合同名称")
@@ -116,9 +95,9 @@ public class ExtContractSaveReqVO {
     @ExcelProperty("备注")
     private String remark;
 
-    @Schema(description = "合同附件url", example = "https://www.iocoder.cn")
+    @Schema(description = "合同附件url")
     @ExcelProperty("合同附件url")
-    private String contractFileUrl;
+    private List<FileDTO> contractFileUrl;
 
     @Schema(description = "建安费")
     @ExcelProperty("建安费")
@@ -154,9 +133,9 @@ public class ExtContractSaveReqVO {
     @ExcelProperty("审定金额")
     private BigDecimal approvedAmount;
 
-    @Schema(description = "审核文件url", example = "https://www.iocoder.cn")
+    @Schema(description = "审核文件url")
     @ExcelProperty("审核文件url")
-    private String reviewFileUrl;
+    private List<FileDTO> reviewFileUrl;
 
     @Schema(description = "最后编辑人")
     @ExcelProperty("最后编辑人")

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

@@ -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);
-    }
 }

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

@@ -1,76 +0,0 @@
-package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-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.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.service.outscontracthistory.OutsContractHistoryService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 外包合同历史")
-@RestController
-@RequestMapping("/cms/outs-contract-history")
-@Validated
-public class OutsContractHistoryController {
-
-    @Resource
-    private OutsContractHistoryService outsContractHistoryService;
-
-    @PutMapping("/update")
-    @Operation(summary = "更新外包合同历史")
-    @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:update')")
-    public CommonResult<Boolean> updateOutsContractHistory(@Valid @RequestBody OutsContractHistorySaveReqVO updateReqVO) {
-        outsContractHistoryService.updateOutsContractHistory(updateReqVO);
-        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) {
-        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<OutsContractHistoryRespVO> pageResult = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO);
-        return success(pageResult);
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出外包合同历史 Excel")
-    @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportOutsContractHistoryExcel(@Valid OutsContractHistoryPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<OutsContractHistoryRespVO> list = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "外包合同历史.xls", "数据", OutsContractHistoryRespVO.class,
-                        BeanUtils.toBean(list, OutsContractHistoryRespVO.class));
-    }
-
-}

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

@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 外包合同历史分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class OutsContractHistoryPageReqVO extends PageParam {
-
-    @Schema(description = "项目id", example = "31803")
-    private Long projectId;
-
-    @Schema(description = "合同名称", example = "芋艿")
-    private String name;
-
-    @Schema(description = "主合同id", example = "19949")
-    private Long contractId;
-
-    @Schema(description = "类型", example = "1")
-    private String countType;
-
-    @Schema(description = "专业")
-    private String major;
-
-    @Schema(description = "流程状态", example = "2")
-    private String processStatus;
-
-    @Schema(description = "外包合同id", example = "24736")
-    private Long outsContractId;
-
-    @Schema(description = "版本")
-    private String version;
-
-}

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

@@ -1,85 +0,0 @@
-package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 外包合同历史 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class OutsContractHistoryRespVO {
-
-    @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;
-
-    @Schema(description = "类型", example = "1")
-    @ExcelProperty(value = "类型", converter = DictConvert.class)
-    @DictFormat("contract_billing_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private String countType;
-
-    @Schema(description = "合同金额")
-    @ExcelProperty("合同金额")
-    private BigDecimal amount;
-
-    @Schema(description = "编号")
-    @ExcelProperty("编号")
-    private String code;
-
-    @Schema(description = "专业")
-    @ExcelProperty(value = "专业", converter = DictConvert.class)
-    @DictFormat("major") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private String major;
-
-    @Schema(description = "流程实体id", example = "32397")
-    @ExcelProperty("流程实体id")
-    private String processInstanceId;
-
-    @Schema(description = "签订时间")
-    @ExcelProperty("签订时间")
-    private LocalDateTime signingTime;
-
-    @Schema(description = "结算数")
-    @ExcelProperty("结算数")
-    private BigDecimal settlementAmount;
-
-    @Schema(description = "合同文件url", example = "https://www.iocoder.cn")
-    @ExcelProperty("合同文件url")
-    private String contractFileUrl;
-
-    @Schema(description = "流程状态", example = "2")
-    @ExcelProperty("流程状态")
-    private String processStatus;
-
-    @Schema(description = "外包合同id", example = "24736")
-    @ExcelProperty("外包合同id")
-    private Long outsContractId;
-
-    @Schema(description = "版本")
-    @ExcelProperty("版本")
-    private String version;
-
-}

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

@@ -1,77 +0,0 @@
-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;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 外包合同历史新增/修改 Request VO")
-@Data
-public class OutsContractHistorySaveReqVO {
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16040")
-    private Long id;
-
-    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31803")
-    @NotNull(message = "项目id不能为空")
-    private Long projectId;
-
-
-    @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;
-
-    @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 = "签订时间")
-    private LocalDateTime signingTime;
-
-    @Schema(description = "结算数")
-    private BigDecimal settlementAmount;
-
-    @Schema(description = "合同文件url", example = "https://www.iocoder.cn")
-    private String contractFileUrl;
-
-    @Schema(description = "流程状态", example = "2")
-    private String processStatus;
-
-    @Schema(description = "外包合同id", example = "24736")
-    private Long outsContractId;
-
-    @Schema(description = "版本")
-    private String version;
-
-}

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

@@ -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;
@@ -32,10 +34,7 @@ public class ContractDO extends BaseDO {
      * 项目id
      */
     private Long projectId;
-    /**
+
-     * 外部合同id
-     */
-    private Long extContractId;
     /**
      * 合同名称
      */

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDetailDO.java

@@ -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;
+
+
+}

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/extcontract/ExtContractDetailDO.java

@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.cms.dal.dataobject.extcontract;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author wyw
+ * @description
+ *  @date 2024/8/14
+ */
+@Data
+public class ExtContractDetailDO extends ExtContractDO {
+    /**
+     * 项目编号
+     */
+    private String code;
+
+    /**
+     * 建设方
+     */
+    private String constructionSide;
+
+    /**
+     * 主控部门
+     */
+    private String trackingDep;
+
+    /**
+     * 项目负责人
+     */
+    private String projectManager;
+
+    /**
+     * 外部合同商议提示
+     */
+    private LocalDateTime exReminderTime;
+
+}

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

@@ -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())
         );
-
     }
 
+
+
+
 }
 

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/customerCompany/CustomerCompanyMapper.java

@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.cms.dal.mysql.customerCompany;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
-import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo.*;
-
-/**
- * 客户公司 Mapper
- *
- * @author hhyykk
- */
-@Mapper
-public interface CustomerCompanyMapper extends BaseMapperX<CustomerCompanyDO> {
-
-    default PageResult<CustomerCompanyDO> selectPage(CustomerCompanyPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<CustomerCompanyDO>()
-                .likeIfPresent(CustomerCompanyDO::getContacts, reqVO.getContacts())
-                .likeIfPresent(CustomerCompanyDO::getName, reqVO.getName())
-                .eqIfPresent(CustomerCompanyDO::getAddress, reqVO.getAddress())
-                .eqIfPresent(CustomerCompanyDO::getPhone, reqVO.getPhone())
-                .orderByDesc(CustomerCompanyDO::getId));
-    }
-
-}

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

@@ -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
  *
@@ -17,11 +19,16 @@ public interface ExtContractMapper extends BaseMapperX<ExtContractDO> {
 
     default PageResult<ExtContractDO> selectPage(ExtContractPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ExtContractDO>()
-                .likeIfPresent(ExtContractDO::getName, reqVO.getName())
+                .eqIfPresent(ExtContractDO::getProjectId, reqVO.getProjectId())
                 .eqIfPresent(ExtContractDO::getType, reqVO.getType())
-                .eqIfPresent(ExtContractDO::getProgress, reqVO.getProgress())
                 .eqIfPresent(ExtContractDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(ExtContractDO::getContractId, reqVO.getContractId()));
     }
 
+    default List<ExtContractDO> selectLocalDateTime(Long contractId) {
+        return selectList(new LambdaQueryWrapperX<ExtContractDO>()
+                .eqIfPresent(ExtContractDO::getContractId,contractId)
+                .orderByDesc(ExtContractDO::getReminderTime));
+    }
+
 }

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

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryPageReqVO;
-import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 外包合同历史 Mapper
- *
- * @author zqc
- */
-@Mapper
-public interface OutsContractHistoryMapper extends BaseMapperX<OutsContractHistoryDO> {
-
-    default PageResult<OutsContractHistoryDO> selectPage(OutsContractHistoryPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<OutsContractHistoryDO>()
-                .eqIfPresent(OutsContractHistoryDO::getProjectId, reqVO.getProjectId())
-                .likeIfPresent(OutsContractHistoryDO::getName, reqVO.getName())
-                .eqIfPresent(OutsContractHistoryDO::getContractId, reqVO.getContractId())
-                .eqIfPresent(OutsContractHistoryDO::getCountType, reqVO.getCountType())
-                .eqIfPresent(OutsContractHistoryDO::getMajor, reqVO.getMajor())
-                .eqIfPresent(OutsContractHistoryDO::getProcessStatus, reqVO.getProcessStatus())
-                .eqIfPresent(OutsContractHistoryDO::getOutsContractId, reqVO.getOutsContractId())
-                .eqIfPresent(OutsContractHistoryDO::getVersion, reqVO.getVersion()));
-    }
-
-}

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

@@ -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;
@@ -36,14 +37,6 @@ public interface ContractService {
      */
     void deleteContract(Long id);
 
-    /**
-     * 获得合同
-     *
-     * @param id 编号
-     * @return 合同
-     */
-    ContractRespVO getContract(Long id);
-
     /**
      * 获得合同分页
      *
@@ -52,19 +45,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 +54,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);
+
 
 
 

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

@@ -1,15 +1,13 @@
 package cn.iocoder.yudao.module.cms.service.contract;
 
-import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.hutool.core.bean.BeanUtil;
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDetailDO;
-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.iocoder.yudao.module.cms.dal.mysql.contract.ContractMapper;
-import cn.iocoder.yudao.module.cms.dal.mysql.contractHistory.ContractHistoryMapper;
+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.projectschedule.ProjectScheduleApi;
-import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
+import cn.iocoder.yudao.module.pms.api.projectschedule.dto.ProjectScheduleDetailDTO;
-import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
+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,9 @@ 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.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.*;
@@ -38,130 +35,43 @@ 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);
+        String name = createReqVO.getName();
-
+        String trimName = name.trim();
-        //校验联表的字段是否和所联系的表内容相同
+        List<ContractDO> projectList = contractMapper.selectList("project_id", projectId);
-        ProjectRespDTO project = projectApi.getProject(projectId);
+        for (ContractDO contractDO : projectList) {
-        ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId);
+            if (contractDO.getName().equals(trimName)){
-
-
-        //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)) {
                 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 +80,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();
@@ -189,113 +99,44 @@ public class ContractServiceImpl implements ContractService {
         contractMapper.deleteById(id);
     }
 
-
-    @Override
-    public ContractRespVO getContract(Long id) {
-        //校验
-        if (id == null) {
-            throw exception(CONTRACT_NOT_EXISTS);
-        }
-
-        ContractDO contractDO = contractMapper.selectById(id);
-        if (contractDO == null) {
-            throw exception(CONTRACT_NOT_EXISTS);
-        }
-
-        Long projectId = contractDO.getProjectId();
-
-        if (projectId == null) {
-            throw exception(PROJECT_NOT_EXISTS);
-        }
-        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);
-
-
-        return contractRespVO;
-    }
-
     @Override
     public PageResult<ContractRespVO> getContractPage(ContractPageReqVO pageReqVO) {
-        //校验
+        PageResult<ContractDO> contractDOPage = contractMapper.selectPage(pageReqVO);
-        if (pageReqVO == null) {
+        List<ContractDO> list = contractDOPage.getList();
-            throw exception(PARAM_NOT_EXISTS);
+        List<ContractDetailDO> contractRespVOList = new ArrayList<>();
-        }
 
-        Long projectId = pageReqVO.getProjectId();
+        for (ContractDO contractDO : list) {
-        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);
+            ContractDetailDO contractDetail = getContractDetail(id);
-            contractRespVOList.add(contract);
+            contractRespVOList.add(contractDetail);
         }
+        List<ContractRespVO> respVOList = BeanUtils.toBean(contractRespVOList, ContractRespVO.class);
         PageResult<ContractRespVO> pageResult = new PageResult<>();
-        pageResult.setList(contractRespVOList);
+        pageResult.setList(respVOList);
         return pageResult;
     }
 
-    @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) {
+    public ContractDetailDO getContractDetail(Long id) {
-        String type = contractSaveReqVO.getCountType();
+        ContractDetailDO contractDetailDO = new ContractDetailDO();
-        BigDecimal amount = contractSaveReqVO.getAmount();
+        ContractDO contractDO = contractMapper.selectById(id);
-        BigDecimal bigDecimal = new BigDecimal(String.valueOf(amount));
+        //校验
-        BigDecimal mul = new BigDecimal("0.85");
+        if (contractDO == null) {
-        BigDecimal res = null;
+            throw exception(CONTRACT_NOT_EXISTS);
-        if ("费率合同".equals(type)) {
-            res = bigDecimal.multiply(mul);
-        } else if ("总价合同".equals(type)) {
-            res = amount;
         }
-        return res;
+        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);
+
+        return contractDetailDO;
     }
 
 
@@ -305,48 +146,4 @@ public class ContractServiceImpl implements ContractService {
             throw exception(CONTRACT_NOT_EXISTS);
         }
     }
-
-    @Override
-    public ContractProcessInstanceRespVO getContractProcess(Long id) {
-        validateContractExists(id);
-        //去历史里面找
-        ContractHistoryDO contractHistory = contractHistoryMapper.selectOne("contract_id", id);
-        if (contractHistory == 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());
-
-        //如果不相等
-        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);
-    }
-
-    @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;
-    }
-
-
 }

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

@@ -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();

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/customerCompany/CustomerCompanyService.java

@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.cms.service.customerCompany;
-
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo.*;
-import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-/**
- * 客户公司 Service 接口
- *
- * @author hhyykk
- */
-public interface CustomerCompanyService {
-
-    /**
-     * 创建客户公司
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createCustomerCompany(@Valid CustomerCompanySaveReqVO createReqVO);
-
-    /**
-     * 更新客户公司
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateCustomerCompany(@Valid CustomerCompanySaveReqVO updateReqVO);
-
-    /**
-     * 删除客户公司
-     *
-     * @param id 编号
-     */
-    void deleteCustomerCompany(Long id);
-
-    /**
-     * 获得客户公司
-     *
-     * @param id 编号
-     * @return 客户公司
-     */
-    CustomerCompanyDO getCustomerCompany(Long id);
-
-    /**
-     * 获得客户公司分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 客户公司分页
-     */
-    PageResult<CustomerCompanyDO> getCustomerCompanyPage(CustomerCompanyPageReqVO pageReqVO);
-
-}

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/customerCompany/CustomerCompanyServiceImpl.java

@@ -1,71 +0,0 @@
-package cn.iocoder.yudao.module.cms.service.customerCompany;
-
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-
-import cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo.*;
-import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
-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.customerCompany.CustomerCompanyMapper;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
-
-/**
- * 客户公司 Service 实现类
- *
- * @author hhyykk
- */
-@Service
-@Validated
-public class CustomerCompanyServiceImpl implements CustomerCompanyService {
-
-    @Resource
-    private CustomerCompanyMapper customerCompanyMapper;
-
-    @Override
-    public Long createCustomerCompany(CustomerCompanySaveReqVO createReqVO) {
-        // 插入
-        CustomerCompanyDO customerCompany = BeanUtils.toBean(createReqVO, CustomerCompanyDO.class);
-        customerCompanyMapper.insert(customerCompany);
-        // 返回
-        return customerCompany.getId();
-    }
-
-    @Override
-    public void updateCustomerCompany(CustomerCompanySaveReqVO updateReqVO) {
-        // 校验存在
-        validateCustomerCompanyExists(updateReqVO.getId());
-        // 更新
-        CustomerCompanyDO updateObj = BeanUtils.toBean(updateReqVO, CustomerCompanyDO.class);
-        customerCompanyMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteCustomerCompany(Long id) {
-        // 校验存在
-        validateCustomerCompanyExists(id);
-        // 删除
-        customerCompanyMapper.deleteById(id);
-    }
-
-    private void validateCustomerCompanyExists(Long id) {
-        if (customerCompanyMapper.selectById(id) == null) {
-            throw exception(CUSTOMER_COMPANY_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public CustomerCompanyDO getCustomerCompany(Long id) {
-        return customerCompanyMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<CustomerCompanyDO> getCustomerCompanyPage(CustomerCompanyPageReqVO pageReqVO) {
-        return customerCompanyMapper.selectPage(pageReqVO);
-    }
-
-}

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

@@ -1,14 +1,14 @@
 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 cn.iocoder.yudao.module.cms.dal.dataobject.extcontract.ExtContractDetailDO;
 import jakarta.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
-import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -46,7 +46,7 @@ public interface ExtContractService {
      * @param id 编号
      * @return 外部合同
      */
-    ExtContractRespVO getExtContract(Long id);
+    ExtContractDetailDO getContractDetail(Long id);
 
     /**
      * 获得外部合同分页
@@ -57,31 +57,10 @@ public interface ExtContractService {
     PageResult<ExtContractRespVO> getExtContractPage(ExtContractPageReqVO pageReqVO);
 
     /**
-     * 合同总金额
+     * 得到合同商议时间
-     * @param id 通过id计算
+     * @param contractId 合同id
      * @return
      */
-    BigDecimal getContractAmountById(Long id);
+    LocalDateTime getLocalDateTime(Long contractId);
-    /**
-     * 合同总金额
-     * @param createReqVO 通过对象计算
-     * @return
-     */
-    BigDecimal getContractAmount(ExtContractSaveReqVO createReqVO);
-
-
-    /**
-     * 查询流程
-     * @param id 合同id
-     */
-    ContractProcessInstanceRespVO getContractProcess(Long id);
-
-    /**
-     * 查询历史外部合同流程
-     * @param projectId 项目id
-     * @return
-     */
-    List<ContractProcessInstanceRespVO> getHistoryContractProcess(Long projectId);
-
 
 }

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

@@ -1,24 +1,15 @@
 package cn.iocoder.yudao.module.cms.service.extContract;
-
+import cn.hutool.core.bean.BeanUtil;
-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;
 import cn.iocoder.yudao.module.cms.dal.dataobject.extcontract.ExtContractDO;
-import cn.iocoder.yudao.module.cms.dal.dataobject.extcontracthistory.ExtContractHistoryDO;
+import cn.iocoder.yudao.module.cms.dal.dataobject.extcontract.ExtContractDetailDO;
-import cn.iocoder.yudao.module.cms.dal.mysql.customerCompany.CustomerCompanyMapper;
 import cn.iocoder.yudao.module.cms.dal.mysql.extContract.ExtContractMapper;
-import cn.iocoder.yudao.module.cms.dal.mysql.extcontracthistory.ExtContractHistoryMapper;
+import cn.iocoder.yudao.module.pms.api.projectschedule.ProjectScheduleApi;
-import cn.iocoder.yudao.module.cms.enums.ChargingStandardEnum;
+import cn.iocoder.yudao.module.pms.api.projectschedule.dto.ProjectScheduleDetailDTO;
-import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum;
+import cn.iocoder.yudao.module.pms.api.projecttracking.ProjectTrackingApi;
-import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum;
+import cn.iocoder.yudao.module.pms.api.projecttracking.dto.ProjectTrackingDetailDTO;
-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;
@@ -26,14 +17,12 @@ import org.springframework.validation.annotation.Validated;
 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.*;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_NOT_EXISTS;
 
 /**
  * 外部合同 Service 实现类
@@ -44,165 +33,48 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_NOT_E
 @Validated
 public class ExtContractServiceImpl implements ExtContractService {
 
-    /**
-     * 外部合同立项审批流程定义
-     */
-    public static final String PROCESS_KEY = "ext_contract_init";
-
-    /**
-     * 版本
-     */
-    public static String VERSION = "1";
-
     @Resource
     private ExtContractMapper extContractMapper;
 
-    @Resource
-    private ProjectApi projectApi;
-
-    @Resource
-    private CustomerCompanyMapper customerCompanyMapper;
-
     @Resource
     private AdminUserApi adminUserApi;
 
     @Resource
-    private BpmProcessInstanceApi processInstanceApi;
+    private ProjectTrackingApi projectTrackingApi;
 
     @Resource
-    private ExtContractHistoryMapper extContractHistoryMapper;
+    private ProjectScheduleApi projectScheduleApi;
+
 
 
 
 
     @Override
     public Long createExtContract(Long loginUserId, ExtContractSaveReqVO createReqVO) {
-
-
-        if (createReqVO == null) {
-            throw exception(PARAM_NOT_EXISTS);
-        }
-        if (loginUserId == null) {
-            throw exception(PARAM_NOT_EXISTS);
-        }
         String userName = adminUserApi.getUser(loginUserId).getNickname();
-        if (userName == null) {
+        //校验,项目是否存在
-            throw exception(USER_NOT_EXISTS);
+        Long contractId = createReqVO.getContractId();
+        String name = createReqVO.getName();
+        String trimName = name.trim();
+        List<ExtContractDO> extContractList = extContractMapper.selectList("contract_id", contractId);
+        for (ExtContractDO extContractDO : extContractList) {
+            if (extContractDO.getName().equals(trimName)){
+                throw exception(EXT_CONTRACT_EXISTS);
+            }
         }
-
         ExtContractDO extContract = BeanUtils.toBean(createReqVO, ExtContractDO.class);
-        //校验
+        extContract.setCreator(userName);
-        Long projectId = extContract.getProjectId();
+        extContract.setUpdater(userName);
-        projectApi.validProjectExist(projectId);
+        extContractMapper.insert(extContract);
-
-
-        //校验联表的字段是否和所联系的表内容相同
-        ProjectRespDTO project = projectApi.getProject(projectId);
-        ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId);
-
-        //        需要联表查询
-        //        1.项目编号 pms_project 直接 √
-        //        2.主控部门(跟踪部门) pms_project找到的是id 需要联表 √
-        //        3.项目经理 pms_project找到的是id 需要联表 √
-        //        4.客户公司名称 pms_project 联表 √
-        //        5.合同总金额 √
-        //        6.合同商议提示（和分包提示不一样）√
-
-        //todo 待提取 枚举优化
-        String code = createReqVO.getCode();
-        String trackingDep = createReqVO.getTrackingDep();
-        String projectManager = createReqVO.getProjectManager();
-        String customerCompanyName = createReqVO.getCustomerCompanyName();
-        //LocalDateTime exReminderTime = createReqVO.getExReminderTime();
-        BigDecimal amount = createReqVO.getAmount();
-
-
-
-
-        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);
-        extContractDO.setCreator(userName);
-        extContractDO.setUpdater(userName);
-
-
-
-        //判断该合同是否已经存在,比较各个字段值是否完全一样
-        //得到所有的合同？逐个比较？
-
-
-        List<ExtContractDO> extContractList = extContractMapper.selectList("project_id",projectId);
-        List<ExtContractRespVO> respVOList = BeanUtils.toBean(extContractList, ExtContractRespVO.class);
-
-        for (ExtContractRespVO respVO : respVOList) {
-            if (respVO.equals(contractRespVO)){
-                throw exception(CONTRACT_ALREADY_EXISTS);
-            }
-        }
-        extContractMapper.insert(extContractDO);
-
-
-        Long extContractId = extContractDO.getId();
-        ExtContractHistoryDO extContractHistory = BeanUtils.toBean(extContractDO, ExtContractHistoryDO.class);
-
-
-        // 启动流程，同时写入历史合同
-        if (createReqVO.getId() == null) {
-            String processInstanceId = processInstanceApi.createProcessInstance(loginUserId,
-                    new BpmProcessInstanceCreateReqDTO()
-                            .setProcessDefinitionKey(PROCESS_KEY).setBusinessKey(String.valueOf(extContractId)));
-
-            // 写入工作流编号
-            extContractHistory.setProcessInstanceId(processInstanceId);
-            extContractHistory.setExtContractId(extContractId);
-
-            Long count = extContractHistoryMapper.selectCount("project_id", projectId);
-            if (count < 1) {
-                extContractHistory.setVersion(VERSION);
-            } else {
-                extContractHistory.setVersion(String.valueOf(count+1));
-            }
-
-            extContractHistory.setProcessStatus("0");
-            extContractHistoryMapper.insert(extContractHistory);
-        }
-
-
         //返回
         return extContract.getId();
     }
 
     @Override
     public void updateExtContract(Long loginUserId, ExtContractSaveReqVO updateReqVO) {
-        //校验
-        if (updateReqVO == null) {
-            throw exception(PARAM_NOT_EXISTS);
-        }
 
         validateExtContractExists(updateReqVO.getId());
-        projectApi.validProjectExist(updateReqVO.getProjectId());
         String userName = adminUserApi.getUser(loginUserId).getNickname();
-        if (userName == null) {
-            throw exception(USER_NOT_EXISTS);
-        }
         // 更新
         ExtContractDO updateObj = BeanUtils.toBean(updateReqVO, ExtContractDO.class);
         updateObj.setUpdater(userName);
@@ -217,151 +89,47 @@ public class ExtContractServiceImpl implements ExtContractService {
         extContractMapper.deleteById(id);
     }
 
-
-    //        需要联表查询
-    //        1.项目编号 pms_project 直接 √
-    //        2.主控部门(跟踪部门) pms_project找到的是id 需要联表 √
-    //        3.项目经理 pms_project找到的是id 需要联表 √
-    //        4.客户公司名称 pms_project 联表 √
-    //        5.合同总金额 √
-    //        6.合同商议提示（和分包提示不一样）√
     @Override
-    public ExtContractRespVO getExtContract(Long id) {
+    public ExtContractDetailDO getContractDetail(Long id) {
-        //校验
+        ExtContractDetailDO extContractDetailDO = new ExtContractDetailDO();
-        if (id == null) {
-            throw exception(EXT_CONTRACT_NOT_EXISTS);
-        }
-
         ExtContractDO extContractDO = extContractMapper.selectById(id);
+        //校验
         if (extContractDO == null) {
             throw exception(EXT_CONTRACT_NOT_EXISTS);
         }
 
         Long projectId = extContractDO.getProjectId();
-        if (projectApi.getProject(projectId) == null) {
+        projectTrackingApi.validateProjectExists(projectId);
-            throw exception(PROJECT_NOT_EXISTS);
+        ProjectScheduleDetailDTO projectScheduleDetail = projectScheduleApi.getProjectScheduleDetail(projectId);
-        }
+        ProjectTrackingDetailDTO projectTracking = projectTrackingApi.getProjectTracking(projectId);
+        BeanUtil.copyProperties(extContractDO, extContractDetailDO);
+        BeanUtil.copyProperties(projectTracking,extContractDetailDO);
+        BeanUtil.copyProperties(projectScheduleDetail,extContractDetailDO);
 
-        //Long customerCompanyId = extContractDO.getCustomerCompanyId();
+        return extContractDetailDO;
-        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();
-        //extContractRespVO.setCustomerCompanyName(name);
-
-
-        //合同总金额
-
-        BigDecimal contractAmount = getContractAmountById(id);
-        extContractRespVO.setAmount(contractAmount);
-
-        //合同商议提示 // TODO 待优化
-        extContractRespVO.setExReminderTime(null);
-
-        extContractRespVO.setType(ContractTypeEnum.getNoByCode(extContractRespVO.getType()));
-        extContractRespVO.setStatus(ContractStatusEnum.getNoByCode(extContractRespVO.getStatus()));
-        extContractRespVO.setCountType(ContractStatusEnum.getNoByCode(extContractRespVO.getCountType()));
-        extContractRespVO.setSource(ContractStatusEnum.getNoByCode(extContractRespVO.getSource()));
-        extContractRespVO.setChargingStandard(ChargingStandardEnum.getNoByCode(extContractRespVO.getChargingStandard()));
-
-
-        return extContractRespVO;
     }
 
     @Override
     public PageResult<ExtContractRespVO> getExtContractPage(ExtContractPageReqVO pageReqVO) {
-        if (pageReqVO == null) {
+        PageResult<ExtContractDO> extContractPage = extContractMapper.selectPage(pageReqVO);
-            throw exception(PARAM_NOT_EXISTS);
+        List<ExtContractDO> list = extContractPage.getList();
-        }
+        List<ExtContractDetailDO> extContractDetailDOList = new ArrayList<>();
 
-        PageResult<ExtContractDO> extContractDOPageResult = extContractMapper.selectPage(pageReqVO);
+        for (ExtContractDO extContractDO : list) {
-        List<ExtContractDO> excontractDOList = extContractDOPageResult.getList();
-        List<ExtContractRespVO> extContractRespVOList = new ArrayList<>();
-
-
-        for (ExtContractDO extContractDO : excontractDOList) {
             Long id = extContractDO.getId();
-            ExtContractRespVO extContractRespVO = getExtContract(id);
+            ExtContractDetailDO extContractDetailDO = getContractDetail(id);
-            extContractRespVOList.add(extContractRespVO);
+            extContractDetailDOList.add(extContractDetailDO);
         }
+        List<ExtContractRespVO> respVOS = BeanUtils.toBean(extContractDetailDOList, ExtContractRespVO.class);
         PageResult<ExtContractRespVO> pageResult = new PageResult<>();
-        pageResult.setList(extContractRespVOList);
+        pageResult.setList(respVOS);
         return pageResult;
     }
 
     @Override
-    public BigDecimal getContractAmountById(Long id) {
+    public LocalDateTime getLocalDateTime(Long contractId) {
-        //前期+设计+地勘+其他+检测
+        List<ExtContractDO> extContractDOS = extContractMapper.selectLocalDateTime(contractId);
-        ExtContractDO extContract = extContractMapper.selectById(id);
+        return extContractDOS.get(0).getReminderTime();
-        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;
     }
 
 

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

@@ -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);
+        return null;
-        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;
     }
 
     @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<>();

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

@@ -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);
-
-
 
 }

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

@@ -3,28 +3,18 @@ package cn.iocoder.yudao.module.cms.service.outscontract;
 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;
 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.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
 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;
 import org.springframework.validation.annotation.Validated;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -57,116 +47,18 @@ public class OutsContractServiceImpl implements OutsContractService {
     @Resource
     private ContractService contractService;
 
-    @Resource
-    private ProjectApi projectApi;
-
     @Resource
     private AdminUserApi adminUserApi;
 
     @Resource
     private BpmProcessInstanceApi processInstanceApi;
 
-    @Resource
-    private OutsContractHistoryMapper outsContractHistoryMapper;
 
 
 
     @Override
     public Long createOutsContract(Long loginUserId,OutsContractSaveReqVO createReqVO) {
-        if (createReqVO == null) {
+       return null;
-            throw exception(PARAM_NOT_EXISTS);
-        }
-        if (loginUserId == null) {
-            throw exception(PARAM_NOT_EXISTS);
-        }
-        String userName = adminUserApi.getUser(loginUserId).getNickname();
-        if (userName == null) {
-            throw exception(USER_NOT_EXISTS);
-        }
-
-        OutsContractDO outsContractDO = BeanUtils.toBean(createReqVO, OutsContractDO.class);
-        //校验
-        Long projectId = outsContractDO.getProjectId();
-        projectApi.validProjectExist(projectId);
-
-
-        //校验联表的字段是否和所联系的表内容相同
-        ContractRespVO contract = contractService.getContract(createReqVO.getContractId());
-        //        需要联表查询
-        //        1.合同名称 √
-        //        2.主控部门(跟踪部门) √
-        //        3.项目经理 √
-        //        4.签订合同总额 √
-
-        //todo 待提取 枚举优化
-        String name = createReqVO.getName();
-        String trackingDep = createReqVO.getTrackingDep();
-        String projectManager = createReqVO.getProjectManager();
-        BigDecimal outsAmount = createReqVO.getOutsAmount();
-
-
-        if (!contract.getName().equals(name)){
-            throw exception(PARAM_ERROR);
-        }
-        if (!contract.getTrackingDep().equals(trackingDep)){
-            throw exception(PARAM_ERROR);
-        }
-        if (!contract.getProjectManager().equals(projectManager)){
-            throw exception(PARAM_ERROR);
-        }
-        if (contract.getAmount().compareTo(outsAmount) != 0){
-            throw exception(PARAM_ERROR);
-        }
-
-
-
-        OutsContractRespVO outsContractRespVO = BeanUtils.toBean(outsContractDO, OutsContractRespVO.class);
-        outsContractDO.setCreator(userName);
-        outsContractDO.setUpdater(userName);
-
-
-
-        //判断该合同是否已经存在,比较各个字段值是否完全一样
-        //得到所有的合同？逐个比较？
-
-
-        List<OutsContractDO> outsContractDOList = outsContractMapper.selectList("project_id", projectId);
-        List<OutsContractRespVO> outsContractRespList = BeanUtils.toBean(outsContractDOList, OutsContractRespVO.class);
-
-        for (OutsContractRespVO respVO : outsContractRespList) {
-            if (respVO.equals(outsContractRespVO)){
-                throw exception(CONTRACT_ALREADY_EXISTS);
-            }
-        }
-        outsContractMapper.insert(outsContractDO);
-
-
-        Long outsContractDOId = outsContractDO.getId();
-        OutsContractHistoryDO outsContractHistoryDO = BeanUtils.toBean(outsContractDO, OutsContractHistoryDO.class);
-
-
-        // 启动流程，同时写入历史合同
-        if (createReqVO.getId() == null) {
-            String processInstanceId = processInstanceApi.createProcessInstance(loginUserId,
-                    new BpmProcessInstanceCreateReqDTO()
-                            .setProcessDefinitionKey(PROCESS_KEY).setBusinessKey(String.valueOf(outsContractDOId)));
-
-            // 写入工作流编号
-            outsContractHistoryDO.setProcessInstanceId(processInstanceId);
-            outsContractHistoryDO.setOutsContractId(outsContractDOId);
-
-            Long count = outsContractHistoryMapper.selectCount("project_id", projectId);
-            if (count < 1) {
-                outsContractHistoryDO.setVersion(VERSION);
-            } else {
-                outsContractHistoryDO.setVersion(String.valueOf(count+1));
-            }
-
-            outsContractHistoryDO.setProcessStatus("0");
-            outsContractHistoryMapper.insert(outsContractHistoryDO);
-        }
-
-        return outsContractDO.getId();
     }
 
     @Override
@@ -175,10 +67,6 @@ public class OutsContractServiceImpl implements OutsContractService {
         validateOutsContractExists(updateReqVO.getId());
 
         Long contractId = updateReqVO.getContractId();
-        ContractRespVO contract = contractService.getContract(contractId);
-        if (contract == null) {
-            throw exception(CONTRACT_NOT_EXISTS);
-        }
         OutsContractDO outsContractDO = outsContractMapper.selectById(updateReqVO.getId());
         if (!Objects.equals(updateReqVO.getProjectId(), outsContractDO.getProjectId())) {
             throw exception(PROJECT_NOT_EXISTS);
@@ -216,12 +104,7 @@ public class OutsContractServiceImpl implements OutsContractService {
         OutsContractDO outsContractDO = outsContractMapper.selectById(id);
         OutsContractRespVO outsContractRespVO = BeanUtils.toBean(outsContractDO, OutsContractRespVO.class);
         Long contractId = outsContractDO.getContractId();
-        ContractRespVO contract = contractService.getContract(contractId);
 
-        outsContractRespVO.setName(contract.getName());
-        outsContractRespVO.setTrackingDep(contract.getTrackingDep());
-        outsContractRespVO.setProjectManager(contract.getProjectManager());
-        outsContractRespVO.setOutsAmount(contract.getAmount());
 
         outsContractRespVO.setMajor(OutsContractMajorEnum.getNoByCode(outsContractRespVO.getMajor()));
         outsContractRespVO.setCountType(CountTypeEnum.getNoByCode(outsContractRespVO.getCountType()));
@@ -236,11 +119,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 +136,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) {

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

@@ -1,41 +0,0 @@
-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;
-
-/**
- * 外包合同历史 Service 接口
- *
- * @author zqc
- */
-public interface OutsContractHistoryService {
-
-    /**
-     * 更新外包合同历史
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateOutsContractHistory(@Valid OutsContractHistorySaveReqVO updateReqVO);
-
-
-    /**
-     * 获得外包合同历史
-     *
-     * @param id 编号
-     * @return 外包合同历史
-     */
-    OutsContractHistoryRespVO getOutsContractHistory(Long id);
-
-    /**
-     * 获得外包合同历史分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 外包合同历史分页
-     */
-    PageResult<OutsContractHistoryRespVO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO);
-
-}

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

@@ -1,110 +0,0 @@
-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.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;
-
-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.*;
-import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.PROJECT_NOT_EXISTS;
-
-/**
- * 外包合同历史 Service 实现类
- *
- * @author zqc
- */
-@Service
-@Validated
-public class OutsContractHistoryServiceImpl implements OutsContractHistoryService {
-
-    @Resource
-    private OutsContractHistoryMapper outsContractHistoryMapper;
-
-    @Resource
-    private ProjectApi projectApi;
-
-    @Resource
-    private ContractService contractService;
-
-    @Override
-    public void updateOutsContractHistory(OutsContractHistorySaveReqVO updateReqVO) {
-        // 校验存在
-        validateOutsContractHistoryExists(updateReqVO.getId());
-        // 更新
-        OutsContractHistoryDO updateObj = BeanUtils.toBean(updateReqVO, OutsContractHistoryDO.class);
-        outsContractHistoryMapper.updateById(updateObj);
-    }
-
-    private void validateOutsContractHistoryExists(Long id) {
-        if (outsContractHistoryMapper.selectById(id) == null) {
-            throw exception(OUTS_CONTRACT_HISTORY_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    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());
-
-        outsContractHistoryResp.setMajor(OutsContractMajorEnum.getNoByCode(outsContractHistoryResp.getMajor()));
-        outsContractHistoryResp.setCountType(CountTypeEnum.getNoByCode(outsContractHistoryResp.getCountType()));
-
-        return outsContractHistoryResp;
-    }
-
-    @Override
-    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;
-    }
-
-}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/project/ProjectApi.java

@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.pms.api.project;
-
-import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
-import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
-
-public interface ProjectApi {
-    /**
-     * 获得项目部分信息
-     */
-    ProjectRespDTO getProject(Long projectId);
-
-    /**
-     * 获得项目detail信息
-     */
-    ProjectDetailRespDTO getProjectDetailById(Long projectId);
-
-    /**
-     * 判断项目是否存在
-     * @param projectId
-     */
-    void validProjectExist(Long projectId);
-
-}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/project/dto/ProjectDetailRespDTO.java

@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.pms.api.project.dto;
-
-import lombok.Data;
-
-@Data
-public class ProjectDetailRespDTO {
-
-    /**
-     * 跟踪部门
-     */
-    private String trackingDepName;
-    /**
-     * 项目经理
-     */
-    private String projectManagerName;
-
-    /**
-     * 客户公司
-     */
-    private String customerCompanyName;
-
-
-}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/project/dto/ProjectRespDTO.java

@@ -1,46 +0,0 @@
-package cn.iocoder.yudao.module.pms.api.project.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 项目基本信息 dto
- */
-@Data
-public class ProjectRespDTO{
-
-
-    /**
-     * 项目编号
-     */
-    private String code;
-
-    /**
-     * 出图公司
-     */
-    private String drawingCompany;
-
-    /**
-     * 跟踪部门id
-     */
-    private Long trackingDepId;
-
-    /**
-     * 客户公司id
-     */
-    private Long customerCompanyId;
-
-    /**
-     * 项目经理id
-     */
-    private Long projectManagerId;
-
-    /**
-     * 预计合同金额
-     */
-    private BigDecimal contractAmount;
-
-
-
-}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projectschedule/ProjectScheduleApi.java

@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.pms.api.projectschedule;
+
+import cn.iocoder.yudao.module.pms.api.projectschedule.dto.ProjectScheduleDetailDTO;
+
+public interface ProjectScheduleApi {
+
+    /**
+     * 获得项目进度信息
+     * @param projectId 项目id
+     * @return
+     */
+    ProjectScheduleDetailDTO getProjectScheduleDetail(Long projectId);
+
+
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projectschedule/dto/ProjectScheduleDetailDTO.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.pms.api.projectschedule.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author wyw
+ * @description
+ * @date 2024/8/14
+ */
+@Data
+public class ProjectScheduleDetailDTO {
+
+    /**
+     * 项目负责人
+     */
+    private String projectManager;
+
+    /**
+     * 外部合同商议提示
+     */
+    private LocalDateTime exReminderTime;
+
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projecttracking/ProjectTrackingApi.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.pms.api.projecttracking;
+
+import cn.iocoder.yudao.module.pms.api.projecttracking.dto.ProjectTrackingDetailDTO;
+
+public interface ProjectTrackingApi {
+
+    /**
+     * 得到项目跟踪信息
+     * @param projectId 项目id
+     * @return
+     */
+    ProjectTrackingDetailDTO getProjectTracking(Long projectId);
+
+    /**
+     * 判断项目是否存在
+     * @param id
+     */
+    void validateProjectExists(Long id);
+
+
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projecttracking/dto/ProjectTrackingDetailDTO.java

@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.pms.api.projecttracking.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wyw
+ * @description
+ * @date 2024/8/14
+ */
+@Data
+public class ProjectTrackingDetailDTO {
+
+    /**
+     * 项目编号
+     */
+    private String code;
+
+    /**
+     * 跟踪部门
+     */
+    private String trackingDep;
+
+
+    /**
+     * 出图公司
+     */
+    private String drawingCompany;
+
+    /**
+     * 预计公司合同总金额
+     */
+    private BigDecimal expectedContractAmount;
+
+    /**
+     * 建设方
+     */
+    private String constructionSide;
+
+
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstants.java

@@ -25,8 +25,11 @@ public interface ErrorCodeConstants {
     // ========== 应收款管理历史记录 1_024_000_000 ==========
     ErrorCode RECEIVABLES_HISTORY_NOT_EXISTS = new ErrorCode(1_024_000_000, "应收款管理历史记录不存在");
 
-    // ========== 项目进度管理 1_024_000_000 ==========
+    // ========== 项目进度管理 1_025_000_000 ==========
     ErrorCode PROJECT_SCHEDULE_NOT_EXISTS = new ErrorCode(1_025_000_000, "项目进度管理不存在");
 
+    // ========== 项目追踪信息不存在 1_026_000_000 ==========
+    ErrorCode PROJECT_TRACKING_NOT_EXISTS = new ErrorCode(1_026_000_000, "项目进度管理不存在");
+
 
 }

yudao-module-pms/yudao-module-pms-biz/pom.xml

@@ -63,12 +63,8 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-excel</artifactId>
         </dependency>
-        <dependency>
+
-            <groupId>cn.iocoder.boot</groupId>
+
-            <artifactId>yudao-module-cms-biz</artifactId>
-            <version>2.1.0-snapshot</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/project/ProjectImpl.java

@@ -1,44 +0,0 @@
-package cn.iocoder.yudao.module.pms.api.project;
-
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-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.pms.dal.dataobject.project.ProjectDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDetailDO;
-import cn.iocoder.yudao.module.pms.dal.mysql.project.ProjectMapper;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstants.PROJECT_NOT_EXISTS;
-
-@Service
-@Validated
-public class ProjectImpl implements ProjectApi {
-
-
-    @Resource
-    private ProjectMapper projectMapper;
-
-
-    @Override
-    public ProjectRespDTO getProject(Long projectId) {
-        ProjectDO projectDO = projectMapper.selectById(projectId);
-        return BeanUtils.toBean(projectDO, ProjectRespDTO.class);
-    }
-
-    @Override
-    public ProjectDetailRespDTO getProjectDetailById(Long projectId) {
-        ProjectDetailDO projectMapperDetail = projectMapper.getDetailById(projectId);
-        return BeanUtils.toBean(projectMapperDetail, ProjectDetailRespDTO.class);
-    }
-
-    @Override
-    public void validProjectExist(Long projectId) {
-        if (projectMapper.selectById(projectId) == null) {
-            throw exception(PROJECT_NOT_EXISTS);
-        }
-    }
-
-}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/projectschedule/ProjectScheduleImpl.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.pms.api.projectschedule;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.api.projectschedule.dto.ProjectScheduleDetailDTO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule.ProjectScheduleDO;
+import cn.iocoder.yudao.module.pms.service.projectschedule.ProjectScheduleService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+
+
+@Service
+@Validated
+public class ProjectScheduleImpl implements ProjectScheduleApi {
+
+
+    @Resource
+        private ProjectScheduleService projectScheduleService;
+
+    @Override
+    public ProjectScheduleDetailDTO getProjectScheduleDetail(Long projectId) {
+        ProjectScheduleDO projectScheduleDetail = projectScheduleService.getProjectScheduleDetail(projectId);
+        return BeanUtils.toBean(projectScheduleDetail, ProjectScheduleDetailDTO.class);
+    }
+
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/projecttracking/ProjectTrackingImpl.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.pms.api.projecttracking;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.api.projecttracking.dto.ProjectTrackingDetailDTO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDetailDO;
+import cn.iocoder.yudao.module.pms.service.projecttracking.ProjectTrackingService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+
+@Service
+@Validated
+public class ProjectTrackingImpl implements ProjectTrackingApi {
+
+    @Resource
+    private ProjectTrackingService projectTrackingService;
+
+    @Override
+    public ProjectTrackingDetailDTO getProjectTracking(Long id) {
+        ProjectTrackingDetailDO projectTrackingDetail = projectTrackingService.getProjectTrackingDetail(id);
+        return BeanUtils.toBean(projectTrackingDetail, ProjectTrackingDetailDTO.class);
+    }
+
+    @Override
+    public void validateProjectExists(Long id) {
+        projectTrackingService.validateProjectExists(id);
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectschedule/vo/ProjectSchedulePageReqVO.java

@@ -20,7 +20,7 @@ public class ProjectSchedulePageReqVO extends PageParam {
     private Long projectId;
 
     @Schema(description = "项目负责人")
-    private String projectLeader;
+    private String projectManager;
 
     @Schema(description = "主专业")
     private String major;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectschedule/vo/ProjectScheduleRespVO.java

@@ -23,7 +23,7 @@ public class ProjectScheduleRespVO {
 
     @Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("项目负责人")
-    private String projectLeader;
+    private String projectManager;
 
     @Schema(description = "主专业", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("主专业")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectschedule/vo/ProjectScheduleSaveReqVO.java

@@ -20,11 +20,9 @@ public class ProjectScheduleSaveReqVO {
     private Long projectId;
 
     @Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "项目负责人不能为空")
+    private String projectManager;
-    private String projectLeader;
 
     @Schema(description = "主专业", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "主专业不能为空")
     private String major;
 
     @Schema(description = "其他专业")
@@ -34,34 +32,27 @@ public class ProjectScheduleSaveReqVO {
     private String minorUserIds;
 
     @Schema(description = "规模", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "规模不能为空")
     private String scale;
 
     @Schema(description = "项目概况", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "项目概况不能为空")
     private String survey;
 
     @Schema(description = "相关批复文件url", example = "https://www.iocoder.cn")
     private String replyFileUrl;
 
     @Schema(description = "当前阶段", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "当前阶段不能为空")
     private String stage;
 
     @Schema(description = "已完成的项目阶段", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "已完成的项目阶段不能为空")
     private String preStage;
 
     @Schema(description = "工作进展", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "工作进展不能为空")
     private String progress;
 
     @Schema(description = "外部合同商议时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "外部合同商议时间不能为空")
     private LocalDateTime contractNegotiationTime;
 
     @Schema(description = "已完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "已完成百分比不能为空")
     private BigDecimal completed;
 
     @Schema(description = "截至本月累计完成百分比")
@@ -91,26 +82,4 @@ public class ProjectScheduleSaveReqVO {
     @Schema(description = "最后编辑人")
     private String finalEditor;
 
-    @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "创建人不能为空")
-    private String creator;
-
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "更新人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "更新人不能为空")
-    private String updator;
-
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    @Schema(description = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否删除不能为空")
-    private Boolean deleted;
-
-    @Schema(description = "租户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "租户id不能为空")
-    private Long tenantId;
-
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projecttracking/vo/ProjectTrackingPageReqVO.java

@@ -38,16 +38,16 @@ public class ProjectTrackingPageReqVO extends PageParam {
     private BigDecimal projectAmount;
 
     @Schema(description = "预计公司合同总金额")
-    private BigDecimal companyContractAmount;
+    private BigDecimal expectedContractAmount;
 
     @Schema(description = "有效合同额")
     private BigDecimal effectiveContractAmount;
 
     @Schema(description = "建设方")
-    private BigDecimal constructionSide;
+    private String constructionSide;
 
     @Schema(description = "发包人")
-    private BigDecimal lettingPartyPeople;
+    private String drawingCompany;
 
     @Schema(description = "客户联系人")
     private String customerUser;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projecttracking/vo/ProjectTrackingRespVO.java

@@ -50,7 +50,7 @@ public class ProjectTrackingRespVO {
 
     @Schema(description = "预计公司合同总金额")
     @ExcelProperty("预计公司合同总金额")
-    private BigDecimal companyContractAmount;
+    private BigDecimal expectedContractAmount;
 
     @Schema(description = "有效合同额")
     @ExcelProperty("有效合同额")
@@ -58,11 +58,11 @@ public class ProjectTrackingRespVO {
 
     @Schema(description = "建设方")
     @ExcelProperty("建设方")
-    private BigDecimal constructionSide;
+    private String constructionSide;
 
     @Schema(description = "发包人")
     @ExcelProperty("发包人")
-    private BigDecimal lettingPartyPeople;
+    private BigDecimal drawingCompany;
 
     @Schema(description = "客户联系人")
     @ExcelProperty("客户联系人")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projecttracking/vo/ProjectTrackingSaveReqVO.java

@@ -2,10 +2,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.projecttracking.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
 import jakarta.validation.constraints.*;
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 项目跟踪信息新增/修改 Request VO")
@@ -38,16 +36,16 @@ public class ProjectTrackingSaveReqVO {
     private BigDecimal projectAmount;
 
     @Schema(description = "预计公司合同总金额")
-    private BigDecimal companyContractAmount;
+    private BigDecimal expectedContractAmount;
 
     @Schema(description = "有效合同额")
     private BigDecimal effectiveContractAmount;
 
     @Schema(description = "建设方")
-    private BigDecimal constructionSide;
+    private String constructionSide;
 
     @Schema(description = "发包人")
-    private BigDecimal lettingPartyPeople;
+    private String drawingCompany;
 
     @Schema(description = "客户联系人")
     private String customerUser;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/projectschedule/ProjectScheduleDO.java

@@ -1,17 +1,10 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule;
 
 import lombok.*;
-import java.util.*;
+
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
-import java.math.BigDecimal;
+
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
@@ -42,7 +35,7 @@ public class ProjectScheduleDO extends BaseDO {
     /**
      * 项目负责人
      */
-    private String projectLeader;
+    private String projectManager;
     /**
      * 主专业
      */
@@ -82,7 +75,7 @@ public class ProjectScheduleDO extends BaseDO {
     /**
      * 外部合同商议时间
      */
-    private LocalDateTime contractNegotiationTime;
+    private LocalDateTime exReminderTime;
     /**
      * 已完成百分比
      */
@@ -123,9 +116,5 @@ public class ProjectScheduleDO extends BaseDO {
      * 最后编辑人
      */
     private String finalEditor;
-    /**
-     * 更新人
-     */
-    private String updator;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/projectschedule/ProjectScheduleDetailDO.java

@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule;
+
+import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDO;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * @author wyw
+ * @description
+ * @date 2024/8/14
+ */
+@Data
+public class ProjectScheduleDetailDO extends ProjectDO {
+
+    /**
+     * 项目负责人
+     */
+    private String projectManager;
+
+    /**
+     * 外部合同商议时间
+     */
+    private LocalDateTime exReminderTime;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/projecttracking/ProjectTrackingDO.java

@@ -72,7 +72,7 @@ public class ProjectTrackingDO extends BaseDO {
     /**
      * 预计公司合同总金额
      */
-    private BigDecimal companyContractAmount;
+    private BigDecimal expectedContractAmount;
     /**
      * 有效合同额
      */
@@ -80,11 +80,11 @@ public class ProjectTrackingDO extends BaseDO {
     /**
      * 建设方
      */
-    private BigDecimal constructionSide;
+    private String constructionSide;
     /**
      * 发包人
      */
-    private BigDecimal lettingPartyPeople;
+    private String drawingCompany;
     /**
      * 客户联系人
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/projecttracking/ProjectTrackingDetailDO.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking;
+
+import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDO;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wyw
+ * @description
+ * @date 2024/8/14
+ */
+@Data
+public class ProjectTrackingDetailDO extends ProjectDO {
+
+
+
+    /**
+     * 项目编号
+     */
+    private String code;
+
+    /**
+     * 跟踪部门
+     */
+    private String trackingDep;
+
+
+    /**
+     * 出图公司
+     */
+    private String drawingCompany;
+
+    /**
+     * 预计公司合同总金额
+     */
+    private BigDecimal expectedContractAmount;
+
+    /**
+     * 建设方
+     */
+    private String constructionSide;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/projectschedule/ProjectScheduleMapper.java

@@ -8,6 +8,8 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule.ProjectSchedul
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.pms.controller.admin.projectschedule.vo.*;
 
+import java.util.List;
+
 /**
  * 项目进度管理 Mapper
  *
@@ -19,7 +21,6 @@ public interface ProjectScheduleMapper extends BaseMapperX<ProjectScheduleDO> {
     default PageResult<ProjectScheduleDO> selectPage(ProjectSchedulePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProjectScheduleDO>()
                 .eqIfPresent(ProjectScheduleDO::getProjectId, reqVO.getProjectId())
-                .eqIfPresent(ProjectScheduleDO::getProjectLeader, reqVO.getProjectLeader())
                 .eqIfPresent(ProjectScheduleDO::getMajor, reqVO.getMajor())
                 .eqIfPresent(ProjectScheduleDO::getMinorMajors, reqVO.getMinorMajors())
                 .eqIfPresent(ProjectScheduleDO::getMinorUserIds, reqVO.getMinorUserIds())
@@ -29,23 +30,17 @@ public interface ProjectScheduleMapper extends BaseMapperX<ProjectScheduleDO> {
                 .eqIfPresent(ProjectScheduleDO::getStage, reqVO.getStage())
                 .eqIfPresent(ProjectScheduleDO::getPreStage, reqVO.getPreStage())
                 .eqIfPresent(ProjectScheduleDO::getProgress, reqVO.getProgress())
-                .betweenIfPresent(ProjectScheduleDO::getContractNegotiationTime, reqVO.getContractNegotiationTime())
                 .eqIfPresent(ProjectScheduleDO::getCompleted, reqVO.getCompleted())
                 .eqIfPresent(ProjectScheduleDO::getAccumulatedCompletion, reqVO.getAccumulatedCompletion())
                 .eqIfPresent(ProjectScheduleDO::getNewlyIncreasedCompletion, reqVO.getNewlyIncreasedCompletion())
                 .eqIfPresent(ProjectScheduleDO::getFinishOutput, reqVO.getFinishOutput())
-                .eqIfPresent(ProjectScheduleDO::getNewlyIncreasedOutput, reqVO.getNewlyIncreasedOutput())
-                .eqIfPresent(ProjectScheduleDO::getAccumulatedOutput, reqVO.getAccumulatedOutput())
-                .betweenIfPresent(ProjectScheduleDO::getCompletionTime, reqVO.getCompletionTime())
-                .eqIfPresent(ProjectScheduleDO::getChoose, reqVO.getChoose())
-                .eqIfPresent(ProjectScheduleDO::getCompletionFileUrl, reqVO.getCompletionFileUrl())
-                .eqIfPresent(ProjectScheduleDO::getFinalEditor, reqVO.getFinalEditor())
-                .eqIfPresent(ProjectScheduleDO::getCreator, reqVO.getCreator())
-                .betweenIfPresent(ProjectScheduleDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(ProjectScheduleDO::getUpdator, reqVO.getUpdator())
-                .betweenIfPresent(ProjectScheduleDO::getUpdateTime, reqVO.getUpdateTime())
-                .eqIfPresent(ProjectScheduleDO::getDeleted, reqVO.getDeleted())
                 .orderByDesc(ProjectScheduleDO::getId));
     }
 
+    default List<ProjectScheduleDO> selectOneManager(Long projectId) {
+        return selectList(new LambdaQueryWrapperX<ProjectScheduleDO>()
+                .eqIfPresent(ProjectScheduleDO::getProjectId,projectId)
+                .orderByDesc(ProjectScheduleDO::getCreateTime));
+    }
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/projecttracking/ProjectTrackingMapper.java

@@ -4,10 +4,13 @@ package cn.iocoder.yudao.module.pms.dal.mysql.projecttracking;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule.ProjectScheduleDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.pms.controller.admin.projecttracking.vo.*;
 
+import java.util.List;
+
 /**
  * 项目跟踪信息 Mapper
  *
@@ -25,10 +28,8 @@ public interface ProjectTrackingMapper extends BaseMapperX<ProjectTrackingDO> {
                 .eqIfPresent(ProjectTrackingDO::getCity, reqVO.getCity())
                 .eqIfPresent(ProjectTrackingDO::getProjectOverview, reqVO.getProjectOverview())
                 .eqIfPresent(ProjectTrackingDO::getProjectAmount, reqVO.getProjectAmount())
-                .eqIfPresent(ProjectTrackingDO::getCompanyContractAmount, reqVO.getCompanyContractAmount())
                 .eqIfPresent(ProjectTrackingDO::getEffectiveContractAmount, reqVO.getEffectiveContractAmount())
                 .eqIfPresent(ProjectTrackingDO::getConstructionSide, reqVO.getConstructionSide())
-                .eqIfPresent(ProjectTrackingDO::getLettingPartyPeople, reqVO.getLettingPartyPeople())
                 .eqIfPresent(ProjectTrackingDO::getCustomerUser, reqVO.getCustomerUser())
                 .eqIfPresent(ProjectTrackingDO::getCustomerPhone, reqVO.getCustomerPhone())
                 .eqIfPresent(ProjectTrackingDO::getCooperationCompany, reqVO.getCooperationCompany())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectschedule/ProjectScheduleService.java

@@ -50,4 +50,13 @@ public interface ProjectScheduleService {
      */
     PageResult<ProjectScheduleDO> getProjectSchedulePage(ProjectSchedulePageReqVO pageReqVO);
 
+    /**
+     * 获得项目进度信息
+     * @param projectId 项目id
+     * @return
+     */
+    ProjectScheduleDO getProjectScheduleDetail(Long projectId);
+
+
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectschedule/ProjectScheduleServiceImpl.java

@@ -11,6 +11,8 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.pms.dal.mysql.projectschedule.ProjectScheduleMapper;
 
+import java.util.List;
+
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstants.*;
 
@@ -68,4 +70,16 @@ public class ProjectScheduleServiceImpl implements ProjectScheduleService {
         return projectScheduleMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public ProjectScheduleDO getProjectScheduleDetail(Long projectId) {
+        List<ProjectScheduleDO> projectScheduleDOS = projectScheduleMapper.selectOneManager(projectId);
+        if (projectScheduleDOS == null || projectScheduleDOS.isEmpty()) {
+            throw exception(PROJECT_SCHEDULE_NOT_EXISTS);
+        }
+
+        return projectScheduleDOS.get(0);
+    }
+
+
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projecttracking/ProjectTrackingService.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.pms.service.projecttracking;
 
 import java.util.*;
+
+import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDetailDO;
 import jakarta.validation.*;
 import cn.iocoder.yudao.module.pms.controller.admin.projecttracking.vo.*;
 import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDO;
@@ -52,4 +54,17 @@ public interface ProjectTrackingService {
      */
     PageResult<ProjectTrackingDO> getProjectTrackingPage(ProjectTrackingPageReqVO pageReqVO);
 
+    /**
+     * 判断项目是否存在
+     * @param id
+     */
+    void validateProjectExists(Long id);
+
+    /**
+     * 获得项目跟踪基础信息
+     * @param id 项目id
+     * @return
+     */
+    ProjectTrackingDetailDO getProjectTrackingDetail(Long id);
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projecttracking/ProjectTrackingServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.service.projecttracking;
 
+import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDetailDO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -71,4 +72,18 @@ public class ProjectTrackingServiceImpl implements ProjectTrackingService {
         return projectTrackingMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public void validateProjectExists(Long id) {
+        if (projectTrackingMapper.selectById(id) == null) {
+            throw exception(PROJECT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ProjectTrackingDetailDO getProjectTrackingDetail(Long id) {
+        ProjectTrackingDO projectTrackingDO = projectTrackingMapper.selectById(id);
+        return BeanUtils.toBean(projectTrackingDO, ProjectTrackingDetailDO.class);
+    }
+
+
 }