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

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

.gitignore

@@ -50,4 +50,5 @@ rebel.xml
 
 application-my.yaml
 
+application-local.yaml
 /yudao-ui-app/unpackage/

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

@@ -8,28 +8,17 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
  * @date 2024/7/3
  */
 public interface ErrorCodeConstants {
-    ErrorCode CUSTOMER_COMPANY_NOT_EXISTS = new ErrorCode(1_020_000_000, "客户公司管理不存在");
+    ErrorCode CUSTOMER_COMPANY_NOT_EXISTS = new ErrorCode(2_019_000_000, "客户信息表不存在");
+    ErrorCode CONTRACT_NOT_EXISTS = new ErrorCode(2_020_000_000, "合同不存在");
+    ErrorCode CONTRACT_HISTORY_NOT_EXISTS = new ErrorCode(2_021_000_000, "历史合同不存在");
 
-    ErrorCode CONTRACT_NOT_EXISTS = new ErrorCode(2_024_000_000, "合同不存在");
+    ErrorCode EXT_CONTRACT_NOT_EXISTS = new ErrorCode(2_022_000_000, "外部合同不存在");
 
-    ErrorCode CONTRACT_HISTORY_NOT_EXISTS = new ErrorCode(2_025_000_000, "历史合同不存在");
+    ErrorCode CONTRACT_OUTS_NOT_EXISTS = new ErrorCode(2_023_000_000, "外部合同不存在");
 
+    ErrorCode OUTS_CONTRACT_NOT_EXISTS = new ErrorCode(2_024_000_000, "外包合同不存在");
 
-    ErrorCode EXT_CONTRACT_NOT_EXISTS = new ErrorCode(2_026_000_000, "外部合同不存在");
-
-
-    ErrorCode EXT_CONTRACT_HISTORY_NOT_EXISTS = new ErrorCode(2_027_000_000, "历史外部合同不存在");
-
-    ErrorCode CONTRACT_EXT_NOT_EXISTS = new ErrorCode(2_028_000_000, "外部合同关联不存在");
-
-    // ========== 外包合同 2_021_000_000 ==========
-    ErrorCode OUTS_CONTRACT_NOT_EXISTS = new ErrorCode(2_021_000_000, "外包合同不存在");
-
-    // ========== 外包合同历史 2_022_000_000 ==========
-    ErrorCode OUTS_CONTRACT_HISTORY_NOT_EXISTS = new ErrorCode(2_022_000_000, "外包合同历史不存在");
-
-    // ========== 外包合同关联 2_023_000_000 ==========
-    ErrorCode CONTRACT_OUTS_NOT_EXISTS = new ErrorCode(2_023_000_000, "外包合同关联不存在");
+    ErrorCode OUTS_CONTRACT_HISTORY_NOT_EXISTS = new ErrorCode(2_025_000_000, "外包合同不存在");
 
 
 }

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

@@ -0,0 +1,95 @@
+//package cn.iocoder.yudao.module.cms.controller.admin.outscontract;
+//
+//import org.springframework.web.bind.annotation.*;
+//import jakarta.annotation.Resource;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import io.swagger.v3.oas.annotations.tags.Tag;
+//import io.swagger.v3.oas.annotations.Parameter;
+//import io.swagger.v3.oas.annotations.Operation;
+//
+//import jakarta.validation.constraints.*;
+//import jakarta.validation.*;
+//import jakarta.servlet.http.*;
+//import java.util.*;
+//import java.io.IOException;
+//
+//import cn.iocoder.yudao.framework.common.pojo.PageParam;
+//import cn.iocoder.yudao.framework.common.pojo.PageResult;
+//import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+//import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+//import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+//
+//import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+//
+//import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+//import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+//
+//import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.*;
+//import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO;
+//import cn.iocoder.yudao.module.cms.service.outscontract.OutsContractService;
+//
+//@Tag(name = "管理后台 - 外包合同")
+//@RestController
+//@RequestMapping("/cms/outs-contract")
+//@Validated
+//public class OutsContractController {
+//
+//    @Resource
+//    private OutsContractService outsContractService;
+//
+//    @PostMapping("/create")
+//    @Operation(summary = "创建外包合同")
+//    @PreAuthorize("@ss.hasPermission('cms:outs-contract:create')")
+//    public CommonResult<Long> createOutsContract(@Valid @RequestBody OutsContractSaveReqVO createReqVO) {
+//        return success(outsContractService.createOutsContract(createReqVO));
+//    }
+//
+//    @PutMapping("/update")
+//    @Operation(summary = "更新外包合同")
+//    @PreAuthorize("@ss.hasPermission('cms:outs-contract:update')")
+//    public CommonResult<Boolean> updateOutsContract(@Valid @RequestBody OutsContractSaveReqVO updateReqVO) {
+//        outsContractService.updateOutsContract(updateReqVO);
+//        return success(true);
+//    }
+//
+//    @DeleteMapping("/delete")
+//    @Operation(summary = "删除外包合同")
+//    @Parameter(name = "id", description = "编号", required = true)
+//    @PreAuthorize("@ss.hasPermission('cms:outs-contract:delete')")
+//    public CommonResult<Boolean> deleteOutsContract(@RequestParam("id") Long id) {
+//        outsContractService.deleteOutsContract(id);
+//        return success(true);
+//    }
+//
+//    @GetMapping("/get")
+//    @Operation(summary = "获得外包合同")
+//    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+//    @PreAuthorize("@ss.hasPermission('cms:outs-contract:query')")
+//    public CommonResult<OutsContractRespVO> getOutsContract(@RequestParam("id") Long id) {
+//        OutsContractDO outsContract = outsContractService.getOutsContract(id);
+//        return success(BeanUtils.toBean(outsContract, OutsContractRespVO.class));
+//    }
+//
+//    @GetMapping("/page")
+//    @Operation(summary = "获得外包合同分页")
+//    @PreAuthorize("@ss.hasPermission('cms:outs-contract:query')")
+//    public CommonResult<PageResult<OutsContractRespVO>> getOutsContractPage(@Valid OutsContractPageReqVO pageReqVO) {
+//        PageResult<OutsContractDO> pageResult = outsContractService.getOutsContractPage(pageReqVO);
+//        return success(BeanUtils.toBean(pageResult, OutsContractRespVO.class));
+//    }
+//
+//    @GetMapping("/export-excel")
+//    @Operation(summary = "导出外包合同 Excel")
+//    @PreAuthorize("@ss.hasPermission('cms:outs-contract:export')")
+//    @ApiAccessLog(operateType = EXPORT)
+//    public void exportOutsContractExcel(@Valid OutsContractPageReqVO pageReqVO,
+//              HttpServletResponse response) throws IOException {
+//        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+//        List<OutsContractDO> list = outsContractService.getOutsContractPage(pageReqVO).getList();
+//        // 导出 Excel
+//        ExcelUtils.write(response, "外包合同.xls", "数据", OutsContractRespVO.class,
+//                        BeanUtils.toBean(list, OutsContractRespVO.class));
+//    }
+//
+//}

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

@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+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 OutsContractPageReqVO extends PageParam {
+
+    @Schema(description = "项目id", example = "27415")
+    private Long projectId;
+
+    @Schema(description = "合同名称", example = "张三")
+    private String name;
+
+    @Schema(description = "主合同id", example = "19816")
+    private Long contractId;
+
+    @Schema(description = "类型", example = "2")
+    private String countType;
+
+    @Schema(description = "合同金额")
+    private BigDecimal amount;
+
+    @Schema(description = "编号")
+    private String code;
+
+    @Schema(description = "专业")
+    private String major;
+
+    @Schema(description = "签订时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] signingTime;
+
+    @Schema(description = "结算数")
+    private BigDecimal settlementAmount;
+
+    @Schema(description = "合同文件url", example = "https://www.iocoder.cn")
+    private String contractFileUrl;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

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

@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 外包合同 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OutsContractRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2034")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27415")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "合同名称", example = "张三")
+    @ExcelProperty("合同名称")
+    private String name;
+
+    @Schema(description = "主合同id", example = "19816")
+    @ExcelProperty("主合同id")
+    private Long contractId;
+
+    @Schema(description = "类型", example = "2")
+    @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 = "签订时间")
+    @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 = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

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

@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.cms.controller.admin.outscontract.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")
+@Data
+public class OutsContractSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2034")
+    private Long id;
+
+    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27415")
+    @NotNull(message = "项目id不能为空")
+    private Long projectId;
+
+    @Schema(description = "合同名称", example = "张三")
+    private String name;
+
+    @Schema(description = "主合同id", example = "19816")
+    private Long contractId;
+
+    @Schema(description = "类型", example = "2")
+    private String countType;
+
+    @Schema(description = "合同金额")
+    private BigDecimal amount;
+
+    @Schema(description = "编号")
+    private String code;
+
+    @Schema(description = "专业")
+    private String major;
+
+    @Schema(description = "签订时间")
+    private LocalDateTime signingTime;
+
+    @Schema(description = "结算数")
+    private BigDecimal settlementAmount;
+
+    @Schema(description = "合同文件url", example = "https://www.iocoder.cn")
+    private String contractFileUrl;
+
+}

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

@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.*;
+import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
+import cn.iocoder.yudao.module.cms.service.outscontracthistory.OutsContractHistoryService;
+
+@Tag(name = "管理后台 - 外包合同历史")
+@RestController
+@RequestMapping("/cms/outs-contract-history")
+@Validated
+public class OutsContractHistoryController {
+
+    @Resource
+    private OutsContractHistoryService outsContractHistoryService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建外包合同历史")
+    @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:create')")
+    public CommonResult<Long> createOutsContractHistory(@Valid @RequestBody OutsContractHistorySaveReqVO createReqVO) {
+        return success(outsContractHistoryService.createOutsContractHistory(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新外包合同历史")
+    @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:update')")
+    public CommonResult<Boolean> updateOutsContractHistory(@Valid @RequestBody OutsContractHistorySaveReqVO updateReqVO) {
+        outsContractHistoryService.updateOutsContractHistory(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除外包合同历史")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:delete')")
+    public CommonResult<Boolean> deleteOutsContractHistory(@RequestParam("id") Long id) {
+        outsContractHistoryService.deleteOutsContractHistory(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得外包合同历史")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:query')")
+    public CommonResult<OutsContractHistoryRespVO> getOutsContractHistory(@RequestParam("id") Long id) {
+        OutsContractHistoryDO outsContractHistory = outsContractHistoryService.getOutsContractHistory(id);
+        return success(BeanUtils.toBean(outsContractHistory, OutsContractHistoryRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得外包合同历史分页")
+    @PreAuthorize("@ss.hasPermission('cms:outs-contract-history:query')")
+    public CommonResult<PageResult<OutsContractHistoryRespVO>> getOutsContractHistoryPage(@Valid OutsContractHistoryPageReqVO pageReqVO) {
+        PageResult<OutsContractHistoryDO> pageResult = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, OutsContractHistoryRespVO.class));
+    }
+
+    @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<OutsContractHistoryDO> 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

@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+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 BigDecimal amount;
+
+    @Schema(description = "编号")
+    private String code;
+
+    @Schema(description = "专业")
+    private String major;
+
+    @Schema(description = "流程实体id", example = "32397")
+    private String processInstanceId;
+
+    @Schema(description = "签订时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] signingTime;
+
+    @Schema(description = "结算数")
+    private BigDecimal settlementAmount;
+
+    @Schema(description = "合同文件url", example = "https://www.iocoder.cn")
+    private String contractFileUrl;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "流程状态", example = "2")
+    private String processStatus;
+
+    @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

@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 外包合同历史 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OutsContractHistoryRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16040")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31803")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "合同名称", example = "芋艿")
+    @ExcelProperty("合同名称")
+    private String name;
+
+    @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 = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @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

@@ -0,0 +1,61 @@
+package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.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")
+@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 = "芋艿")
+    private String name;
+
+    @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/outscontract/OutsContractDO.java

@@ -0,0 +1,78 @@
+package cn.iocoder.yudao.module.cms.dal.dataobject.outscontract;
+
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 外包合同 DO
+ *
+ * @author zqc
+ */
+@TableName("cms_outs_contract")
+@KeySequence("cms_outs_contract_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OutsContractDO extends BaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 合同名称
+     */
+    private String name;
+    /**
+     * 主合同id
+     */
+    private Long contractId;
+    /**
+     * 类型
+     *
+     * 枚举 {@link TODO contract_billing_type 对应的类}
+     */
+    private String countType;
+    /**
+     * 合同金额
+     */
+    private BigDecimal amount;
+    /**
+     * 编号
+     */
+    private String code;
+    /**
+     * 专业
+     *
+     * 枚举 {@link TODO major 对应的类}
+     */
+    private String major;
+    /**
+     * 签订时间
+     */
+    private LocalDateTime signingTime;
+    /**
+     * 结算数
+     */
+    private BigDecimal settlementAmount;
+    /**
+     * 合同文件url
+     */
+    private String contractFileUrl;
+
+}

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontracthistory/OutsContractHistoryDO.java

@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory;
+
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 外包合同历史 DO
+ *
+ * @author zqc
+ */
+@TableName("cms_outs_contract_history")
+@KeySequence("cms_outs_contract_history_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OutsContractHistoryDO extends BaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 合同名称
+     */
+    private String name;
+    /**
+     * 主合同id
+     */
+    private Long contractId;
+    /**
+     * 类型
+     *
+     * 枚举 {@link TODO contract_billing_type 对应的类}
+     */
+    private String countType;
+    /**
+     * 合同金额
+     */
+    private BigDecimal amount;
+    /**
+     * 编号
+     */
+    private String code;
+    /**
+     * 专业
+     *
+     * 枚举 {@link TODO major 对应的类}
+     */
+    private String major;
+    /**
+     * 流程实体id
+     */
+    private String processInstanceId;
+    /**
+     * 签订时间
+     */
+    private LocalDateTime signingTime;
+    /**
+     * 结算数
+     */
+    private BigDecimal settlementAmount;
+    /**
+     * 合同文件url
+     */
+    private String contractFileUrl;
+    /**
+     * 流程状态
+     */
+    private String processStatus;
+    /**
+     * 外包合同id
+     */
+    private Long outsContractId;
+    /**
+     * 版本
+     */
+    private String version;
+
+}

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontract/OutsContractMapper.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.cms.dal.mysql.outscontract;
+
+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.outscontract.OutsContractDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.*;
+
+/**
+ * 外包合同 Mapper
+ *
+ * @author zqc
+ */
+@Mapper
+public interface OutsContractMapper extends BaseMapperX<OutsContractDO> {
+
+    default PageResult<OutsContractDO> selectPage(OutsContractPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OutsContractDO>()
+                .eqIfPresent(OutsContractDO::getProjectId, reqVO.getProjectId())
+                .likeIfPresent(OutsContractDO::getName, reqVO.getName())
+                .eqIfPresent(OutsContractDO::getContractId, reqVO.getContractId())
+                .eqIfPresent(OutsContractDO::getCountType, reqVO.getCountType())
+                .eqIfPresent(OutsContractDO::getAmount, reqVO.getAmount())
+                .eqIfPresent(OutsContractDO::getCode, reqVO.getCode())
+                .eqIfPresent(OutsContractDO::getMajor, reqVO.getMajor())
+                .betweenIfPresent(OutsContractDO::getSigningTime, reqVO.getSigningTime())
+                .eqIfPresent(OutsContractDO::getSettlementAmount, reqVO.getSettlementAmount())
+                .eqIfPresent(OutsContractDO::getContractFileUrl, reqVO.getContractFileUrl())
+                .betweenIfPresent(OutsContractDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(OutsContractDO::getId));
+    }
+
+}

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

@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory;
+
+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.outscontracthistory.OutsContractHistoryDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.*;
+
+/**
+ * 外包合同历史 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::getAmount, reqVO.getAmount())
+                .eqIfPresent(OutsContractHistoryDO::getCode, reqVO.getCode())
+                .eqIfPresent(OutsContractHistoryDO::getMajor, reqVO.getMajor())
+                .eqIfPresent(OutsContractHistoryDO::getProcessInstanceId, reqVO.getProcessInstanceId())
+                .betweenIfPresent(OutsContractHistoryDO::getSigningTime, reqVO.getSigningTime())
+                .eqIfPresent(OutsContractHistoryDO::getSettlementAmount, reqVO.getSettlementAmount())
+                .eqIfPresent(OutsContractHistoryDO::getContractFileUrl, reqVO.getContractFileUrl())
+                .betweenIfPresent(OutsContractHistoryDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(OutsContractHistoryDO::getProcessStatus, reqVO.getProcessStatus())
+                .eqIfPresent(OutsContractHistoryDO::getOutsContractId, reqVO.getOutsContractId())
+                .eqIfPresent(OutsContractHistoryDO::getVersion, reqVO.getVersion())
+                .orderByDesc(OutsContractHistoryDO::getId));
+    }
+
+}

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

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.cms.service.contract;
 
 import cn.iocoder.yudao.module.cms.dal.mysql.contract.ContractMapper;
 import cn.iocoder.yudao.module.cms.dal.mysql.extContract.ExtContractMapper;
-import cn.iocoder.yudao.module.pms.api.ProjectApi;
+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 org.slf4j.Logger;

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

@@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompan
 import cn.iocoder.yudao.module.cms.dal.dataobject.extContract.ExtContractDO;
 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.pms.api.ProjectApi;
+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 org.springframework.stereotype.Service;

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

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.cms.service.outscontract;
+
+import java.util.*;
+import jakarta.validation.*;
+import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.*;
+import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 外包合同 Service 接口
+ *
+ * @author zqc
+ */
+public interface OutsContractService {
+
+    /**
+     * 创建外包合同
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOutsContract(@Valid OutsContractSaveReqVO createReqVO);
+
+    /**
+     * 更新外包合同
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOutsContract(@Valid OutsContractSaveReqVO updateReqVO);
+
+    /**
+     * 删除外包合同
+     *
+     * @param id 编号
+     */
+    void deleteOutsContract(Long id);
+
+    /**
+     * 获得外包合同
+     *
+     * @param id 编号
+     * @return 外包合同
+     */
+    OutsContractDO getOutsContract(Long id);
+
+    /**
+     * 获得外包合同分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 外包合同分页
+     */
+    PageResult<OutsContractDO> getOutsContractPage(OutsContractPageReqVO pageReqVO);
+
+}

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

@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.cms.service.outscontract;
+
+import org.springframework.stereotype.Service;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.*;
+import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.cms.dal.mysql.outscontract.OutsContractMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
+
+/**
+ * 外包合同 Service 实现类
+ *
+ * @author zqc
+ */
+@Service
+@Validated
+public class OutsContractServiceImpl implements OutsContractService {
+
+    @Resource
+    private OutsContractMapper outsContractMapper;
+
+    @Override
+    public Long createOutsContract(OutsContractSaveReqVO createReqVO) {
+        // 插入
+        OutsContractDO outsContract = BeanUtils.toBean(createReqVO, OutsContractDO.class);
+        outsContractMapper.insert(outsContract);
+        // 返回
+        return outsContract.getId();
+    }
+
+    @Override
+    public void updateOutsContract(OutsContractSaveReqVO updateReqVO) {
+        // 校验存在
+        validateOutsContractExists(updateReqVO.getId());
+        // 更新
+        OutsContractDO updateObj = BeanUtils.toBean(updateReqVO, OutsContractDO.class);
+        outsContractMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteOutsContract(Long id) {
+        // 校验存在
+        validateOutsContractExists(id);
+        // 删除
+        outsContractMapper.deleteById(id);
+    }
+
+    private void validateOutsContractExists(Long id) {
+        if (outsContractMapper.selectById(id) == null) {
+            throw exception(OUTS_CONTRACT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public OutsContractDO getOutsContract(Long id) {
+        return outsContractMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<OutsContractDO> getOutsContractPage(OutsContractPageReqVO pageReqVO) {
+        return outsContractMapper.selectPage(pageReqVO);
+    }
+
+}

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

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.cms.service.outscontracthistory;
+
+import java.util.*;
+import jakarta.validation.*;
+import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.*;
+import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 外包合同历史 Service 接口
+ *
+ * @author zqc
+ */
+public interface OutsContractHistoryService {
+
+    /**
+     * 创建外包合同历史
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOutsContractHistory(@Valid OutsContractHistorySaveReqVO createReqVO);
+
+    /**
+     * 更新外包合同历史
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOutsContractHistory(@Valid OutsContractHistorySaveReqVO updateReqVO);
+
+    /**
+     * 删除外包合同历史
+     *
+     * @param id 编号
+     */
+    void deleteOutsContractHistory(Long id);
+
+    /**
+     * 获得外包合同历史
+     *
+     * @param id 编号
+     * @return 外包合同历史
+     */
+    OutsContractHistoryDO getOutsContractHistory(Long id);
+
+    /**
+     * 获得外包合同历史分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 外包合同历史分页
+     */
+    PageResult<OutsContractHistoryDO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO);
+
+}

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

@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.cms.service.outscontracthistory;
+
+import org.springframework.stereotype.Service;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.*;
+import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHistoryMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
+
+/**
+ * 外包合同历史 Service 实现类
+ *
+ * @author zqc
+ */
+@Service
+@Validated
+public class OutsContractHistoryServiceImpl implements OutsContractHistoryService {
+
+    @Resource
+    private OutsContractHistoryMapper outsContractHistoryMapper;
+
+    @Override
+    public Long createOutsContractHistory(OutsContractHistorySaveReqVO createReqVO) {
+        // 插入
+        OutsContractHistoryDO outsContractHistory = BeanUtils.toBean(createReqVO, OutsContractHistoryDO.class);
+        outsContractHistoryMapper.insert(outsContractHistory);
+        // 返回
+        return outsContractHistory.getId();
+    }
+
+    @Override
+    public void updateOutsContractHistory(OutsContractHistorySaveReqVO updateReqVO) {
+        // 校验存在
+        validateOutsContractHistoryExists(updateReqVO.getId());
+        // 更新
+        OutsContractHistoryDO updateObj = BeanUtils.toBean(updateReqVO, OutsContractHistoryDO.class);
+        outsContractHistoryMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteOutsContractHistory(Long id) {
+        // 校验存在
+        validateOutsContractHistoryExists(id);
+        // 删除
+        outsContractHistoryMapper.deleteById(id);
+    }
+
+    private void validateOutsContractHistoryExists(Long id) {
+        if (outsContractHistoryMapper.selectById(id) == null) {
+            throw exception(OUTS_CONTRACT_HISTORY_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public OutsContractHistoryDO getOutsContractHistory(Long id) {
+        return outsContractHistoryMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<OutsContractHistoryDO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO) {
+        return outsContractHistoryMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/budegt/BudgetApi.java

@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.pms.api.budegt;
+
+import cn.iocoder.yudao.module.pms.api.budegt.dto.BudegtDetailRespDTO;
+import cn.iocoder.yudao.module.pms.api.budegt.dto.BudegtResDTO;
+
+public interface BudgetApi {
+    /**
+     * 获得应收款的部分信息
+     */
+    BudegtResDTO getBudegt(Long id);
+
+    /**
+     * 获得应收款的detail信息
+     */
+    BudegtDetailRespDTO getBudegtDetail(Long id);
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/budegt/dto/BudegtDetailRespDTO.java

@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.pms.api.budegt.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class BudegtDetailRespDTO {
+    /**
+     * 合同管理
+     */
+    private Long contractId;
+    /**
+     * 预算文件url
+     */
+    private String budgetFileUrl;
+    /**
+     * 预算外包成本
+     */
+    private BigDecimal outsourcingCosts;
+    /**
+     * 人力成本
+     */
+    private BigDecimal laborCosts;
+    /**
+     * 累计人力成本
+     */
+    private BigDecimal accumulatedLaborCosts;
+    /**
+     * 生产成本
+     */
+    private BigDecimal productCosts;
+    /**
+     * 累计生产成本
+     */
+    private BigDecimal accumulatedProductCosts;
+    /**
+     * 财务成本
+     */
+    private BigDecimal financialCosts;
+    /**
+     * 累计财务成本
+     */
+    private BigDecimal accumulatedFinancialCosts;
+    /**
+     * 回款情况
+     */
+    private String collectionSituation;
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/budegt/dto/BudegtResDTO.java

@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.pms.api.budegt.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class BudegtResDTO {
+
+    /**
+     * 合同管理
+     */
+    private Long contractId;
+    /**
+     * 预算文件url
+     */
+    private String budgetFileUrl;
+    /**
+     * 预算外包成本
+     */
+    private BigDecimal outsourcingCosts;
+    /**
+     * 人力成本
+     */
+    private BigDecimal laborCosts;
+    /**
+     * 累计人力成本
+     */
+    private BigDecimal accumulatedLaborCosts;
+    /**
+     * 生产成本
+     */
+    private BigDecimal productCosts;
+    /**
+     * 累计生产成本
+     */
+    private BigDecimal accumulatedProductCosts;
+    /**
+     * 财务成本
+     */
+    private BigDecimal financialCosts;
+    /**
+     * 累计财务成本
+     */
+    private BigDecimal accumulatedFinancialCosts;
+    /**
+     * 回款情况
+     */
+    private String collectionSituation;
+}

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.pms.api;
+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;

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

@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.pms.api.project;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.api.budegt.BudgetApi;
+import cn.iocoder.yudao.module.pms.api.budegt.dto.BudegtDetailRespDTO;
+import cn.iocoder.yudao.module.pms.api.budegt.dto.BudegtResDTO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.budget.BudgetDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.budget.BudgetMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+@Service
+@Validated
+public class BudgetImpl implements BudgetApi {
+
+    @Resource
+    private BudgetMapper budgetMapper;
+
+    @Override
+    public BudegtResDTO getBudegt(Long id) {
+        BudgetDO budgetDO = budgetMapper.selectById(id);
+        BudegtResDTO budegtResDTO = BeanUtils.toBean(budgetDO, BudegtResDTO.class);
+        return budegtResDTO;
+    }
+
+    @Override
+    public BudegtDetailRespDTO getBudegtDetail(Long id) {
+//        budgetMapper.
+        return null;
+    }
+}

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

@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.pms.api.project;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.pms.api.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.pms.dal.dataobject.project.ProjectDO;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/project/ProjectController.java

@@ -66,6 +66,7 @@ public class ProjectController {
         return success(true);
     }
 
+    // 点击编辑页面后显示的内容
     @GetMapping("/get")
     @Operation(summary = "获得项目基本信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/budget/BudgetMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.pms.dal.mysql.budget.BudgetMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/budgethistory/BudgetHistoryMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.pms.dal.mysql.budgethistory.BudgetHistoryMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

yudao-server/src/main/resources/application-local.yaml

@@ -45,7 +45,7 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3307/hhyykk?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/hhyykk?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
@@ -54,7 +54,7 @@ spring:
           #          url: jdbc:kingbase8://127.0.0.1:54321/test  # 人大金仓 KingbaseES 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/postgres # OpenGauss 连接的示例
           username: root
-          password: root
+          password: we9085@z
           #          username: sa # SQL Server 连接的示例
           #          password: Yudao@2024 # SQL Server 连接的示例
           #          username: SYSDBA # DM 连接的示例
@@ -63,7 +63,7 @@ spring:
           #          password: Yudao@2024 # OpenGauss 连接的示例
         slave: # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:mysql://127.0.0.1:3307/db1?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://127.0.0.1:3306/db1?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
           password: root
 

yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/ContractHistoryForm.vue

@@ -77,7 +77,7 @@
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
       <el-form-item label="合同url" prop="contractFileUrl">
-        <el-input v-model="formData.contractFileUrl" placeholder="请输入合同url" />
+        <UploadFile v-model="formData.contractFileUrl" />
       </el-form-item>
       <el-form-item label="建安费" prop="constructionCost">
         <el-input v-model="formData.constructionCost" placeholder="请输入建安费" />
@@ -110,7 +110,7 @@
         <el-input v-model="formData.approvedAmount" placeholder="请输入审定金额" />
       </el-form-item>
       <el-form-item label="审核文件url" prop="reviewFileUrl">
-        <el-input v-model="formData.reviewFileUrl" placeholder="请输入审核文件url" />
+        <UploadFile v-model="formData.reviewFileUrl" />
       </el-form-item>
       <el-form-item label="创建者" prop="creator">
         <el-input v-model="formData.creator" placeholder="请输入创建者" />

yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/index.vue

@@ -128,15 +128,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="合同url" prop="contractFileUrl">
-        <el-input
-          v-model="queryParams.contractFileUrl"
-          placeholder="请输入合同url"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="建安费" prop="constructionCost">
         <el-input
           v-model="queryParams.constructionCost"
@@ -207,15 +198,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="审核文件url" prop="reviewFileUrl">
-        <el-input
-          v-model="queryParams.reviewFileUrl"
-          placeholder="请输入审核文件url"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="创建者" prop="creator">
         <el-input
           v-model="queryParams.creator"

yudao-ui/yudao-ui-admin-vue3-ExtContract/src/views/cms-ext/extcontract/ExtContractForm.vue

@@ -87,7 +87,7 @@
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
       <el-form-item label="合同附件url" prop="contractFileUrl">
-        <el-input v-model="formData.contractFileUrl" placeholder="请输入合同附件url" />
+        <UploadFile v-model="formData.contractFileUrl" />
       </el-form-item>
       <el-form-item label="建安费" prop="constructionCost">
         <el-input v-model="formData.constructionCost" placeholder="请输入建安费" />
@@ -135,7 +135,7 @@
         <el-input v-model="formData.approvedAmount" placeholder="请输入审定金额" />
       </el-form-item>
       <el-form-item label="审核文件url" prop="reviewFileUrl">
-        <el-input v-model="formData.reviewFileUrl" placeholder="请输入审核文件url" />
+        <UploadFile v-model="formData.reviewFileUrl" />
       </el-form-item>
       <el-form-item label="创建者" prop="creator">
         <el-input v-model="formData.creator" placeholder="请输入创建者" />

yudao-ui/yudao-ui-admin-vue3-ExtContract/src/views/cms-ext/extcontract/index.vue

@@ -171,15 +171,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="合同附件url" prop="contractFileUrl">
-        <el-input
-          v-model="queryParams.contractFileUrl"
-          placeholder="请输入合同附件url"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="建安费" prop="constructionCost">
         <el-input
           v-model="queryParams.constructionCost"
@@ -267,15 +258,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="审核文件url" prop="reviewFileUrl">
-        <el-input
-          v-model="queryParams.reviewFileUrl"
-          placeholder="请输入审核文件url"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="创建者" prop="creator">
         <el-input
           v-model="queryParams.creator"

yudao-ui/yudao-ui-admin-vue3-contract/src/views/cms/contract/ContractForm.vue

@@ -74,7 +74,7 @@
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
       <el-form-item label="合同url" prop="contractFileUrl">
-        <el-input v-model="formData.contractFileUrl" placeholder="请输入合同url" />
+        <UploadFile v-model="formData.contractFileUrl" />
       </el-form-item>
       <el-form-item label="建安费" prop="constructionCost">
         <el-input v-model="formData.constructionCost" placeholder="请输入建安费" />

yudao-ui/yudao-ui-admin-vue3-contract/src/views/cms/contract/index.vue

@@ -119,15 +119,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="合同url" prop="contractFileUrl">
-        <el-input
-          v-model="queryParams.contractFileUrl"
-          placeholder="请输入合同url"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="建安费" prop="constructionCost">
         <el-input
           v-model="queryParams.constructionCost"