[fix] 更新各个合同模块的字段

2025-09-15 17:41:53 +08:00 · 2024-08-12 13:22:33 +08:00
parent f2cfb723a9
commit 50a30ff83e
32 changed files with 941 additions and 832 deletions
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractRespVO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractRespVO.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.contract.vo;

 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;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -18,6 +19,20 @@ import com.alibaba.excel.annotation.*;
 public class ContractRespVO {


+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "19374")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1381")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+    @Schema(description = "外部合同id", example = "32057")
+    @ExcelProperty("外部合同id")
+    private Long extContractId;
+
+
+
    @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
    @ExcelProperty("项目编号")
    private String code;
@@ -26,32 +41,30 @@ public class ContractRespVO {
    @ExcelProperty("主控部门")
    private String trackingDep;

-    @Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("项目经理")
+    @Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("项目负责人")
    private String projectManager;

-    @Schema(description = "分包合同提示时间")
-    @ExcelProperty("分包合同提示时间")
-    private LocalDateTime ReminderTime;
+    @Schema(description = "预计合同金额", requiredMode = Schema.RequiredMode.REQUIRED,example = "200.0000")
+    @ExcelProperty("预计合同金额")
+    private BigDecimal expectedContractAmount;

-    @Schema(description = "暂定结算数")
-    @ExcelProperty("暂定结算数")
-    private BigDecimal provisionalSettlement;
+    @Schema(description = "合同商议提示")
+    @ExcelProperty("合同商议提示")
+    private LocalDateTime reminderTime;

    @Schema(description = "出图公司", requiredMode = Schema.RequiredMode.REQUIRED,example = "***设计院")
    @ExcelProperty("出图公司")
    private String drawingCompany;

-    @Schema(description = "预计合同金额", requiredMode = Schema.RequiredMode.REQUIRED,example = "200.0000")
-    @ExcelProperty("预计合同金额")
-    private BigDecimal expectedContractAmount;
+


    @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
    @ExcelProperty("合同名称")
    private String name;

-    @Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
    @ExcelProperty("合同类型")
    @DictFormat(DictTypeConstants.CONTRACT_TYPE)
    private String type;
@@ -76,16 +89,23 @@ public class ContractRespVO {
    @ExcelProperty("归档时间")
    private LocalDateTime archiveTime;

-    @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("合同状态")
+    @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty(value = "合同状态", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.CONTRACT_STATUS)
    private String status;

-    @Schema(description = "计费方式", example = "1")
-    @ExcelProperty("计费方式")
-    @DictFormat(DictTypeConstants.CONTRACT_TYPE)
+    @Schema(description = "签订合同总额")
+    @ExcelProperty("签订合同总额")
+    private BigDecimal amount;
+
+    @Schema(description = "计费方式", example = "2")
+    @ExcelProperty(value = "计费方式", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.COUNT_TYPE)
    private String countType;

+    @Schema(description = "暂定结算数")
+    @ExcelProperty("暂定结算数")
+    private BigDecimal provisionalSettlement;

    @Schema(description = "备注", example = "随便")
    @ExcelProperty("备注")
@@ -101,12 +121,11 @@ public class ContractRespVO {

    @Schema(description = "资金来源")
    @ExcelProperty("资金来源")
-    @DictFormat(DictTypeConstants.SOURCE)
    private String source;

-    @Schema(description = "优惠", example = "17910")
+    @Schema(description = "优惠", example = "19163")
    @ExcelProperty("优惠")
-    private String discount;
+    private BigDecimal discount;

    @Schema(description = "是否联合体")
    @ExcelProperty("是否联合体")
@@ -118,7 +137,7 @@ public class ContractRespVO {

    @Schema(description = "占主合同比例")
    @ExcelProperty("占主合同比例")
-    private String extProportion;
+    private BigDecimal extProportion;

    @Schema(description = "审定金额", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("审定金额")
@@ -128,28 +147,11 @@ public class ContractRespVO {
    @ExcelProperty("审核文件url")
    private String reviewFileUrl;

-    @Schema(description = "签订合同总额")
-    @ExcelProperty("签订合同总额")
-    private BigDecimal amount;
+    @Schema(description = "最后编辑人")
+    @ExcelProperty("最后编辑人")
+    private String finalEditor;

-    @Schema(description = "前期费")
-    @ExcelProperty("前期费")
-    private BigDecimal preAmount;

-    @Schema(description = "设计费")
-    @ExcelProperty("设计费")
-    private BigDecimal designAmount;

-    @Schema(description = "勘测费")
-    @ExcelProperty("勘测费")
-    private BigDecimal surveyFees;
-
-    @Schema(description = "测量费")
-    @ExcelProperty("测量费")
-    private BigDecimal measurementFee;
-
-    @Schema(description = "其他费")
-    @ExcelProperty("其他费")
-    private BigDecimal otherFee;

 }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractSaveReqVO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractSaveReqVO.java
@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.cms.controller.admin.contract.vo;
 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;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import jakarta.validation.constraints.*;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

@@ -13,12 +15,20 @@ import java.time.LocalDateTime;
@EqualsAndHashCode
 public class ContractSaveReqVO {

-    @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "19374")
+    @ExcelProperty("主键")
    private Long id;

-    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1381")
+    @ExcelProperty("项目id")
    private Long projectId;

+    @Schema(description = "外部合同id", example = "32057")
+    @ExcelProperty("外部合同id")
+    private Long extContractId;
+
+    //
+
    @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
    @ExcelProperty("项目编号")
    private String code;
@@ -27,112 +37,114 @@ public class ContractSaveReqVO {
    @ExcelProperty("主控部门")
    private String trackingDep;

-    @Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("项目经理")
+    @Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("项目负责人")
    private String projectManager;

-    @Schema(description = "分包合同提示时间")
-    @ExcelProperty("分包合同提示时间")
-    private LocalDateTime reminderTime;
-
-    @Schema(description = "暂定结算数")
-    @ExcelProperty("暂定结算数")
-    private BigDecimal provisionalSettlement;
-
-    @Schema(description = "出图公司", requiredMode = Schema.RequiredMode.REQUIRED,example = "***设计院")
-    @ExcelProperty("出图公司")
-    private String drawingCompany;
-
    @Schema(description = "预计合同金额", requiredMode = Schema.RequiredMode.REQUIRED,example = "200.0000")
    @ExcelProperty("预计合同金额")
    private BigDecimal expectedContractAmount;

+    @Schema(description = "合同商议提示")
+    @ExcelProperty("合同商议提示")
+    private LocalDateTime reminderTime;
+
+    @Schema(description = "出图公司", requiredMode = Schema.RequiredMode.REQUIRED,example = "***设计院")
+    @ExcelProperty("出图公司")
+    private String drawingCompany;
+
+


    @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
-    @NotEmpty(message = "合同名称不能为空")
+    @ExcelProperty("合同名称")
    private String name;

-    @Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "合同类型不能为空")
+    @Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("合同类型")
    @DictFormat(DictTypeConstants.CONTRACT_TYPE)
    private String type;

    @Schema(description = "合同进展", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "合同进展不能为空")
+    @ExcelProperty("合同进展")
    private String progress;

    @Schema(description = "合同拟定时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "合同拟定时间不能为空")
+    @ExcelProperty("合同拟定时间")
    private LocalDateTime expectedTime;

    @Schema(description = "合同用印时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "合同用印时间不能为空")
+    @ExcelProperty("合同用印时间")
    private LocalDateTime printingTime;

    @Schema(description = "签订时间")
+    @ExcelProperty("签订时间")
    private LocalDateTime signingTime;

    @Schema(description = "归档时间")
+    @ExcelProperty("归档时间")
    private LocalDateTime archiveTime;

-    @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "合同状态不能为空")
+    @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty(value = "合同状态", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.CONTRACT_STATUS)
    private String status;

-    @Schema(description = "计费方式", example = "1")
-    @DictFormat(DictTypeConstants.CONTRACT_TYPE)
+    @Schema(description = "签订合同总额")
+    @ExcelProperty("签订合同总额")
+    private BigDecimal amount;
+
+    @Schema(description = "计费方式", example = "2")
+    @ExcelProperty(value = "计费方式", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.COUNT_TYPE)
    private String countType;

+    @Schema(description = "暂定结算数")
+    @ExcelProperty("暂定结算数")
+    private BigDecimal provisionalSettlement;
+
    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
    private String remark;

    @Schema(description = "合同url", example = "https://www.iocoder.cn")
+    @ExcelProperty("合同url")
    private String contractFileUrl;

    @Schema(description = "建安费")
+    @ExcelProperty("建安费")
    private BigDecimal constructionCost;

    @Schema(description = "资金来源")
-    @DictFormat(DictTypeConstants.SOURCE)
+    @ExcelProperty("资金来源")
    private String source;

-    @Schema(description = "优惠", example = "17910")
-    private String discount;
+    @Schema(description = "优惠", example = "19163")
+    @ExcelProperty("优惠")
+    private BigDecimal discount;

    @Schema(description = "是否联合体")
+    @ExcelProperty("是否联合体")
    private Boolean consortium;

    @Schema(description = "联合体单位")
+    @ExcelProperty("联合体单位")
    private String consortiumCompany;

    @Schema(description = "占主合同比例")
-    private String extProportion;
+    @ExcelProperty("占主合同比例")
+    private BigDecimal extProportion;

    @Schema(description = "审定金额", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "审定金额不能为空")
+    @ExcelProperty("审定金额")
    private BigDecimal approvedAmount;

    @Schema(description = "审核文件url", example = "https://www.iocoder.cn")
+    @ExcelProperty("审核文件url")
    private String reviewFileUrl;

-    @Schema(description = "签订合同总额")
-    private BigDecimal amount;
-
-    @Schema(description = "前期费")
-    private BigDecimal preAmount;
-
-    @Schema(description = "设计费")
-    private BigDecimal designAmount;
-
-    @Schema(description = "勘测费")
-    private BigDecimal surveyFees;
-
-    @Schema(description = "测量费")
-    private BigDecimal measurementFee;
-
-    @Schema(description = "其他费")
-    private BigDecimal otherFee;
+    @Schema(description = "最后编辑人")
+    @ExcelProperty("最后编辑人")
+    private String finalEditor;

 }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/CustomerCompanyController.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/CustomerCompanyController.java
@@ -1,94 +0,0 @@
-package cn.iocoder.yudao.module.cms.controller.admin.customerCompany;
-
-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.*;
-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.customerCompany.vo.*;
-import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
-import cn.iocoder.yudao.module.cms.service.customerCompany.CustomerCompanyService;
-
-@Tag(name = "管理后台 - 客户公司")
-@RestController
-@RequestMapping("/cms/customer-company")
-@Validated
-public class CustomerCompanyController {
-
-    @Resource
-    private CustomerCompanyService customerCompanyService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建客户公司")
-    @PreAuthorize("@ss.hasPermission('cms:customer-company:create')")
-    public CommonResult<Long> createCustomerCompany(@Valid @RequestBody CustomerCompanySaveReqVO createReqVO) {
-        return success(customerCompanyService.createCustomerCompany(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新客户公司")
-    @PreAuthorize("@ss.hasPermission('cms:customer-company:update')")
-    public CommonResult<Boolean> updateCustomerCompany(@Valid @RequestBody CustomerCompanySaveReqVO updateReqVO) {
-        customerCompanyService.updateCustomerCompany(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除客户公司")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('cms:customer-company:delete')")
-    public CommonResult<Boolean> deleteCustomerCompany(@RequestParam("id") Long id) {
-        customerCompanyService.deleteCustomerCompany(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得客户公司")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('cms:customer-company:query')")
-    public CommonResult<CustomerCompanyRespVO> getCustomerCompany(@RequestParam("id") Long id) {
-        CustomerCompanyDO customerCompany = customerCompanyService.getCustomerCompany(id);
-        return success(BeanUtils.toBean(customerCompany, CustomerCompanyRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得客户公司分页")
-    @PreAuthorize("@ss.hasPermission('cms:customer-company:query')")
-    public CommonResult<PageResult<CustomerCompanyRespVO>> getCustomerCompanyPage(@Valid CustomerCompanyPageReqVO pageReqVO) {
-        PageResult<CustomerCompanyDO> pageResult = customerCompanyService.getCustomerCompanyPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, CustomerCompanyRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出客户公司 Excel")
-    @PreAuthorize("@ss.hasPermission('cms:customer-company:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportCustomerCompanyExcel(@Valid CustomerCompanyPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<CustomerCompanyDO> list = customerCompanyService.getCustomerCompanyPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "客户公司.xls", "数据", CustomerCompanyRespVO.class,
-                        BeanUtils.toBean(list, CustomerCompanyRespVO.class));
-    }
-
-}
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/vo/CustomerCompanyPageReqVO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/vo/CustomerCompanyPageReqVO.java
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-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 CustomerCompanyPageReqVO extends PageParam {
-
-    @Schema(description = "联系人", example = "张三")
-    private String contacts;
-
-    @Schema(description = "公司名称", example = "电力公司")
-    private String name;
-
-    @Schema(description = "地址")
-    private String address;
-
-    @Schema(description = "电话")
-    private String phone;
-
-}
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/vo/CustomerCompanyRespVO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/vo/CustomerCompanyRespVO.java
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
-
-@Schema(description = "管理后台 - 客户公司 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class CustomerCompanyRespVO {
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14907")
-    @ExcelProperty("主键")
-    private Long id;
-
-    @Schema(description = "联系人", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    @ExcelProperty("联系人")
-    private String contacts;
-
-    @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "电力公司")
-    @ExcelProperty("公司名称")
-    private String name;
-
-    @Schema(description = "地址")
-    @ExcelProperty("地址")
-    private String address;
-
-    @Schema(description = "电话")
-    @ExcelProperty("电话")
-    private String phone;
-
-}
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/vo/CustomerCompanySaveReqVO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/customerCompany/vo/CustomerCompanySaveReqVO.java
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
-
-@Schema(description = "管理后台 - 客户公司新增/修改 Request VO")
-@Data
-public class CustomerCompanySaveReqVO {
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14907")
-    private Long id;
-
-    @Schema(description = "联系人", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    @NotEmpty(message = "联系人不能为空")
-    private String contacts;
-
-    @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "电力公司")
-    @NotEmpty(message = "公司名称不能为空")
-    private String name;
-
-    @Schema(description = "地址")
-    private String address;
-
-    @Schema(description = "电话")
-    private String phone;
-
-}
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractRespVO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractRespVO.java
@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo;

 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;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -14,21 +14,25 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
 public class ExtContractRespVO {

+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "964")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "合同id", example = "13085")
+    @ExcelProperty("合同id")
+    private Long contractId;
+
+    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16261")
+    @ExcelProperty("项目id")
+    private Long projectId;
+
+
+

    @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
    @ExcelProperty("项目编号")
    private String code;

-    @Schema(description = "合同名称", example = "芋艿")
-    @ExcelProperty("合同名称")
-    private String name;
-
-    @Schema(description = "合同类型", example = "1")
-    @ExcelProperty("合同类型")
-    @DictFormat(DictTypeConstants.CONTRACT_TYPE)
-    private String type;
-
-
    @Schema(description = "客户名称")
    @ExcelProperty("客户名称")
    private String customerCompanyName;
@@ -37,14 +41,27 @@ public class ExtContractRespVO {
    @ExcelProperty("主控部门")
    private String trackingDep;

-    @Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("项目经理")
+    @Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("项目负责人")
    private String projectManager;

-    @Schema(description = "合同商议提示时间")
-    @ExcelProperty("合同商议提示时间")
+    @Schema(description = "外部合同商议提示时间")
+    @ExcelProperty("外部合同商议提示时间")
    private LocalDateTime exReminderTime;

+
+
+
+
+    @Schema(description = "合同名称", example = "赵六")
+    @ExcelProperty("合同名称")
+    private String name;
+
+    @Schema(description = "合同类型", example = "2")
+    @ExcelProperty(value = "合同类型", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.CONTRACT_TYPE)
+    private String type;
+
    @Schema(description = "合同进展")
    @ExcelProperty("合同进展")
    private String progress;
@@ -62,12 +79,12 @@ public class ExtContractRespVO {
    private LocalDateTime archiveTime;

    @Schema(description = "状态", example = "2")
-    @ExcelProperty("状态")
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.CONTRACT_STATUS)
    private String status;

-    @Schema(description = "合同金额", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("合同金额")
+    @Schema(description = "合同总金额", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同总金额")
    private BigDecimal amount;

    @Schema(description = "前期费用")
@@ -88,14 +105,14 @@ public class ExtContractRespVO {

    @Schema(description = "其他费")
    @ExcelProperty("其他费")
-    private String otherFee;
+    private BigDecimal otherFee;

    @Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("计费方式")
+    @ExcelProperty(value = "计费方式", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.COUNT_TYPE)
    private String countType;

-    @Schema(description = "备注", example = "你猜")
+    @Schema(description = "备注", example = "随便")
    @ExcelProperty("备注")
    private String remark;

@@ -108,22 +125,18 @@ public class ExtContractRespVO {
    private BigDecimal constructionCost;

    @Schema(description = "资金来源")
-    @ExcelProperty("资金来源")
+    @ExcelProperty(value = "资金来源", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.SOURCE)
    private String source;

-    @Schema(description = "分包合同提示时间")
-    @ExcelProperty("分包合同提示时间")
-    private LocalDateTime reminderTime;
-
    @Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("收费标准")
+    @ExcelProperty(value = "收费标准", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.CHARGING_STANDARD)
    private String chargingStandard;

-    @Schema(description = "优惠", example = "15529")
+    @Schema(description = "优惠", example = "123")
    @ExcelProperty("优惠")
-    private String discount;
+    private BigDecimal discount;

    @Schema(description = "是否联合体", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("是否联合体")
@@ -133,6 +146,9 @@ public class ExtContractRespVO {
    @ExcelProperty("联合体单位")
    private String consortiumCompany;

+    @Schema(description = "合同商议提示")
+    @ExcelProperty("合同商议提示")
+    private LocalDateTime reminderTime;

    @Schema(description = "审定金额")
    @ExcelProperty("审定金额")
@@ -142,11 +158,7 @@ public class ExtContractRespVO {
    @ExcelProperty("审核文件url")
    private String reviewFileUrl;

-
-    @Schema(description = "合同id", example = "27460")
-    @ExcelProperty("合同id")
-    private Long contractId;
-
-
-
+    @Schema(description = "最后编辑人")
+    @ExcelProperty("最后编辑人")
+    private String finalEditor;
 }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractSaveReqVO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractSaveReqVO.java
@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo;

 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;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import jakarta.validation.constraints.*;

 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -14,13 +14,21 @@ import java.time.LocalDateTime;
@Data
 public class ExtContractSaveReqVO {

-    @Schema(description = "外部合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "964")
+    @ExcelProperty("主键")
    private Long id;

-    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30598")
-    @NotNull(message = "项目id不能为空")
+    @Schema(description = "合同id", example = "13085")
+    @ExcelProperty("合同id")
+    private Long contractId;
+
+    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16261")
+    @ExcelProperty("项目id")
    private Long projectId;

+
+
+
    @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
    @ExcelProperty("项目编号")
    private String code;
@@ -33,107 +41,126 @@ public class ExtContractSaveReqVO {
    @ExcelProperty("主控部门")
    private String trackingDep;

-    @Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("项目经理")
+    @Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("项目负责人")
    private String projectManager;

-    @Schema(description = "合同提示时间")
-    @ExcelProperty("合同提示时间")
+    @Schema(description = "外部合同商议提示时间")
+    @ExcelProperty("外部合同商议提示时间")
    private LocalDateTime exReminderTime;


-    @Schema(description = "客户公司id", example = "25191")
-    private Long customerCompanyId;

-    @Schema(description = "合同名称", example = "芋艿")
+
+
+    @Schema(description = "合同名称", example = "赵六")
    @ExcelProperty("合同名称")
    private String name;

-    @Schema(description = "合同类型", example = "1")
-    @ExcelProperty("合同类型")
+    @Schema(description = "合同类型", example = "2")
+    @ExcelProperty(value = "合同类型", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.CONTRACT_TYPE)
    private String type;

    @Schema(description = "合同进展")
+    @ExcelProperty("合同进展")
    private String progress;

    @Schema(description = "预计签订时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "预计签订时间不能为空")
+    @ExcelProperty("预计签订时间")
    private LocalDateTime expectedTime;

    @Schema(description = "签订时间")
+    @ExcelProperty("签订时间")
    private LocalDateTime signingTime;

    @Schema(description = "归档时间")
+    @ExcelProperty("归档时间")
    private LocalDateTime archiveTime;

    @Schema(description = "状态", example = "2")
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.CONTRACT_STATUS)
    private String status;

-    @Schema(description = "合同金额", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "合同金额不能为空")
+    @Schema(description = "合同总金额", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同总金额")
    private BigDecimal amount;

    @Schema(description = "前期费用")
+    @ExcelProperty("前期费用")
    private BigDecimal preAmount;

    @Schema(description = "设计费")
+    @ExcelProperty("设计费")
    private BigDecimal designFee;

    @Schema(description = "勘测费")
+    @ExcelProperty("勘测费")
    private BigDecimal surveyFees;

    @Schema(description = "检测费")
+    @ExcelProperty("检测费")
    private BigDecimal testingFee;

    @Schema(description = "其他费")
-    private String otherFee;
+    @ExcelProperty("其他费")
+    private BigDecimal otherFee;

    @Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "计费方式不能为空")
+    @ExcelProperty(value = "计费方式", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.COUNT_TYPE)
    private String countType;

-    @Schema(description = "备注", example = "你猜")
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
    private String remark;

    @Schema(description = "合同附件url", example = "https://www.iocoder.cn")
+    @ExcelProperty("合同附件url")
    private String contractFileUrl;

    @Schema(description = "建安费")
+    @ExcelProperty("建安费")
    private BigDecimal constructionCost;

    @Schema(description = "资金来源")
+    @ExcelProperty(value = "资金来源", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.SOURCE)
    private String source;

    @Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "收费标准不能为空")
+    @ExcelProperty(value = "收费标准", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.CHARGING_STANDARD)
    private String chargingStandard;

-    @Schema(description = "优惠", example = "15529")
-    private String discount;
+    @Schema(description = "优惠", example = "123")
+    @ExcelProperty("优惠")
+    private BigDecimal discount;

    @Schema(description = "是否联合体", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否联合体不能为空")
+    @ExcelProperty("是否联合体")
    private Boolean consortium;

    @Schema(description = "联合体单位")
+    @ExcelProperty("联合体单位")
    private String consortiumCompany;

-    @Schema(description = "分包合同提示时间")
+    @Schema(description = "合同商议提示")
+    @ExcelProperty("合同商议提示")
    private LocalDateTime reminderTime;

    @Schema(description = "审定金额")
+    @ExcelProperty("审定金额")
    private BigDecimal approvedAmount;

    @Schema(description = "审核文件url", example = "https://www.iocoder.cn")
+    @ExcelProperty("审核文件url")
    private String reviewFileUrl;

-    @Schema(description = "合同id", example = "27460")
-    private Long contractId;
+    @Schema(description = "最后编辑人")
+    @ExcelProperty("最后编辑人")
+    private String finalEditor;


 }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractRespVO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractRespVO.java
@@ -16,6 +16,20 @@ import java.time.LocalDateTime;
@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 = "主合同id", example = "19816")
+    @ExcelProperty("主合同id")
+    private Long contractId;
+
+
+
    @Schema(description = "合同名称", example = "张三")
    @ExcelProperty("合同名称")
    private String name;
@@ -24,8 +38,8 @@ public class OutsContractRespVO {
    @ExcelProperty("主控部门")
    private String trackingDep;

-    @Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("项目经理")
+    @Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("项目负责人")
    private String projectManager;

    @Schema(description = "签订合同总额")
@@ -33,28 +47,13 @@ public class OutsContractRespVO {
    private BigDecimal outsAmount;


-    @Schema(description = "外包合同编号")
-    @ExcelProperty("编号")
-    private String code;
-
-    @Schema(description = "外包单位")
-    @ExcelProperty("外包单位")
-    private String outsCompany;
-
-    @Schema(description = "主合同id", example = "19816")
-    @ExcelProperty("主合同id")
-    private Long contractId;


-    @Schema(description = "外包合同类型", example = "2")
-    @ExcelProperty(value = "外包合同类型", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.COUNT_TYPE)
+    @Schema(description = "类型", example = "2")
+    @ExcelProperty(value = "类型", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.CONTRACT_STATUS)
    private String countType;

-    @Schema(description = "外包合同总额")
-    @ExcelProperty("外包合同总额")
-    private BigDecimal amount;
-
    @Schema(description = "专业")
    @ExcelProperty(value = "专业", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.OUTS_CONTRACT_MAJOR)
@@ -64,13 +63,29 @@ public class OutsContractRespVO {
    @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 = "外包单位")
+    @ExcelProperty("外包单位")
+    private String outsCompany;
+
+    @Schema(description = "外包合同金额")
+    @ExcelProperty("外包合同金额")
+    private BigDecimal amount;
+
+    @Schema(description = "外包合同编号")
+    @ExcelProperty("外包合同编号")
+    private Integer code;
+
+    @Schema(description = "最终外包金额")
+    @ExcelProperty("最终外包金额")
+    private BigDecimal finalAmount;
+
+    @Schema(description = "最后编辑人")
+    @ExcelProperty("最后编辑人")
+    private String finalEditor;
+
 }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractSaveReqVO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractSaveReqVO.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
 import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
 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;
@@ -16,12 +15,18 @@ import java.time.LocalDateTime;
 public class OutsContractSaveReqVO {

    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2034")
+    @ExcelProperty("主键")
    private Long id;

    @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27415")
-    @NotNull(message = "项目id不能为空")
+    @ExcelProperty("项目id")
    private Long projectId;

+    @Schema(description = "主合同id", example = "19816")
+    @ExcelProperty("主合同id")
+    private Long contractId;
+
+

    @Schema(description = "合同名称", example = "张三")
    @ExcelProperty("合同名称")
@@ -31,38 +36,22 @@ public class OutsContractSaveReqVO {
    @ExcelProperty("主控部门")
    private String trackingDep;

-    @Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("项目经理")
+    @Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("项目负责人")
    private String projectManager;

    @Schema(description = "签订合同总额")
    @ExcelProperty("签订合同总额")
-    private BigDecimal amount;
-
-    @Schema(description = "外包合同编号")
-    @ExcelProperty("编号")
-    private String code;
-
-    @Schema(description = "外包单位")
-    @ExcelProperty("外包单位")
-    private String outsCompany;
-
-    @Schema(description = "主合同id", example = "19816")
-    @ExcelProperty("主合同id")
-    private Long contractId;
-
-
-    @Schema(description = "外包合同类型", example = "2")
-    @ExcelProperty(value = "外包合同类型", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.COUNT_TYPE)
-    private String countType;
-
-
-    @Schema(description = "外包合同金额")
-    @ExcelProperty("外包合同金额")
    private BigDecimal outsAmount;


+
+
+    @Schema(description = "类型", example = "2")
+    @ExcelProperty(value = "类型", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.CONTRACT_STATUS)
+    private String countType;
+
    @Schema(description = "专业")
    @ExcelProperty(value = "专业", converter = DictConvert.class)
    @DictFormat(DictTypeConstants.OUTS_CONTRACT_MAJOR)
@@ -72,12 +61,29 @@ public class OutsContractSaveReqVO {
    @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 = "外包单位")
+    @ExcelProperty("外包单位")
+    private String outsCompany;
+
+    @Schema(description = "外包合同金额")
+    @ExcelProperty("外包合同金额")
+    private BigDecimal amount;
+
+    @Schema(description = "外包合同编号")
+    @ExcelProperty("外包合同编号")
+    private Integer code;
+
+    @Schema(description = "最终外包金额")
+    @ExcelProperty("最终外包金额")
+    private BigDecimal finalAmount;
+
+    @Schema(description = "最后编辑人")
+    @ExcelProperty("最后编辑人")
+    private String finalEditor;
+
 }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java
@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.cms.dal.dataobject.contract;

-import cn.iocoder.yudao.module.pms.enums.DictTypeConstants;
 import lombok.*;

 import java.time.LocalDateTime;
@@ -10,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;

 /**
- * 合同 DO
+ * 合同管理 DO
 *
 * @author 管理员
 */
@@ -33,14 +32,16 @@ public class ContractDO extends BaseDO {
     * 项目id
     */
    private Long projectId;
+    /**
+     * 外部合同id
+     */
+    private Long extContractId;
    /**
     * 合同名称
     */
    private String name;
    /**
     * 合同类型
-     *
-     * 枚举 枚举 {@link DictTypeConstants}
     */
    private String type;
    /**
@@ -65,12 +66,22 @@ public class ContractDO extends BaseDO {
    private LocalDateTime archiveTime;
    /**
     * 合同状态
+     * 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
     */
    private String status;
+    /**
+     * 签订合同总额
+     */
+    private BigDecimal amount;
    /**
     * 计费方式
+     * 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
     */
    private String countType;
+    /**
+     * 暂定结算数
+     */
+    private BigDecimal provisionalSettlement;
    /**
     * 备注
     */
@@ -90,7 +101,7 @@ public class ContractDO extends BaseDO {
    /**
     * 优惠
     */
-    private String discount;
+    private BigDecimal discount;
    /**
     * 是否联合体
     */
@@ -102,7 +113,7 @@ public class ContractDO extends BaseDO {
    /**
     * 占主合同比例
     */
-    private String extProportion;
+    private BigDecimal extProportion;
    /**
     * 审定金额
     */
@@ -112,28 +123,8 @@ public class ContractDO extends BaseDO {
     */
    private String reviewFileUrl;
    /**
-     * 签订合同总额
+     * 最后编辑人
     */
-    private BigDecimal amount;
-    /**
-     * 前期费
-     */
-    private BigDecimal preAmount;
-    /**
-     * 设计费
-     */
-    private BigDecimal designAmount;
-    /**
-     * 勘测费
-     */
-    private BigDecimal surveyFees;
-    /**
-     * 测量费
-     */
-    private BigDecimal measurementFee;
-    /**
-     * 其他费
-     */
-    private BigDecimal otherFee;
+    private String finalEditor;

 }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/extcontract/ExtContractDO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/extcontract/ExtContractDO.java
@@ -1,12 +1,15 @@
 package cn.iocoder.yudao.module.cms.dal.dataobject.extcontract;
+
 import lombok.*;
+
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;

 /**
- * 外部合同 DO
+ * 外部合同管理 DO
 *
 * @author 管理员
 */
@@ -25,6 +28,10 @@ public class ExtContractDO extends BaseDO {
     */
    @TableId
    private Long id;
+    /**
+     * 合同id
+     */
+    private Long contractId;
    /**
     * 项目id
     */
@@ -35,12 +42,9 @@ public class ExtContractDO extends BaseDO {
    private String name;
    /**
     * 合同类型
+     * 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
     */
    private String type;
-    /**
-     * 客户公司id
-     */
-    private Long customerCompanyId;
    /**
     * 合同进展
     */
@@ -59,10 +63,11 @@ public class ExtContractDO extends BaseDO {
    private LocalDateTime archiveTime;
    /**
     * 状态
+     * 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
     */
    private String status;
    /**
-     * 合同金额
+     * 合同总金额
     */
    private BigDecimal amount;
    /**
@@ -84,9 +89,10 @@ public class ExtContractDO extends BaseDO {
    /**
     * 其他费
     */
-    private String otherFee;
+    private BigDecimal otherFee;
    /**
     * 计费方式
+     * 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
     */
    private String countType;
    /**
@@ -103,16 +109,18 @@ public class ExtContractDO extends BaseDO {
    private BigDecimal constructionCost;
    /**
     * 资金来源
+     * 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
     */
    private String source;
    /**
     * 收费标准
+     * 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
     */
    private String chargingStandard;
    /**
     * 优惠
     */
-    private String discount;
+    private BigDecimal discount;
    /**
     * 是否联合体
     */
@@ -121,7 +129,10 @@ public class ExtContractDO extends BaseDO {
     * 联合体单位
     */
    private String consortiumCompany;
-
+    /**
+     * 合同商议提示
+     */
+    private LocalDateTime reminderTime;
    /**
     * 审定金额
     */
@@ -131,13 +142,8 @@ public class ExtContractDO extends BaseDO {
     */
    private String reviewFileUrl;
    /**
-     * 合同id
+     * 最后编辑人
     */
-    private Long contractId;
-
-    /**
-     * 分包合同提示时间
-     */
-    private LocalDateTime reminderTime;
+    private String finalEditor;

 }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontract/OutsContractDO.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontract/OutsContractDO.java
@@ -1,13 +1,12 @@
 package cn.iocoder.yudao.module.cms.dal.dataobject.outscontract;

-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;

-import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;

 /**
 * 外包合同 DO
@@ -33,45 +32,47 @@ public class OutsContractDO extends BaseDO {
     * 项目id
     */
    private Long projectId;
-    /**
-     * 合同名称
-     */
-    private String name;
    /**
     * 主合同id
     */
    private Long contractId;
    /**
     * 类型
-     *
-     * 枚举 //// TODO 搞成枚举
+     * 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
     */
    private String countType;
-    /**
-     * 外包合同金额
-     */
-    private BigDecimal amount;
-    /**
-     * 编号
-     */
-    private String code;
    /**
     * 专业
-     *
-     * 枚举 // TODO 搞成枚举
+     * 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}3
     */
    private String major;
    /**
     * 签订时间
     */
    private LocalDateTime signingTime;
-    /**
-     * 结算数
-     */
-    private BigDecimal settlementAmount;
    /**
     * 合同文件url
     */
    private String contractFileUrl;
+    /**
+     * 外包单位
+     */
+    private String outsCompany;
+    /**
+     * 外包合同金额
+     */
+    private BigDecimal amount;
+    /**
+     * 外包合同编号
+     */
+    private Integer code;
+    /**
+     * 最终外包金额
+     */
+    private BigDecimal finalAmount;
+    /**
+     * 最后编辑人
+     */
+    private String finalEditor;

 }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extContract/ExtContractMapper.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extContract/ExtContractMapper.java
@@ -19,7 +19,6 @@ public interface ExtContractMapper extends BaseMapperX<ExtContractDO> {
        return selectPage(reqVO, new LambdaQueryWrapperX<ExtContractDO>()
                .likeIfPresent(ExtContractDO::getName, reqVO.getName())
                .eqIfPresent(ExtContractDO::getType, reqVO.getType())
-                .eqIfPresent(ExtContractDO::getCustomerCompanyId, reqVO.getCustomerCompanyId())
                .eqIfPresent(ExtContractDO::getProgress, reqVO.getProgress())
                .eqIfPresent(ExtContractDO::getStatus, reqVO.getStatus())
                .eqIfPresent(ExtContractDO::getContractId, reqVO.getContractId()));
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontract/OutsContractMapper.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontract/OutsContractMapper.java
@@ -18,14 +18,12 @@ 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())
                .orderByDesc(OutsContractDO::getId));
    }
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java
@@ -215,7 +215,7 @@ public class ContractServiceImpl implements ContractService {
 //        3.项目经理 pms_project找到的是id 需要联表 √
 //        4.出图公司 pms_project 直接 √
 //        5.预计合同金额 pms_project 直接 √
-//        6.分包合同商议提示 √
+//        6.合同商议提示 √ 外部合同表里
 //        7.暂定结算数 √

        ProjectRespDTO project = projectApi.getProject(projectId);
--- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractServiceImpl.java
+++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractServiceImpl.java
@@ -8,8 +8,6 @@ import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessI
 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.contractHistory.ContractHistoryDO;
-import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
 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.mysql.customerCompany.CustomerCompanyMapper;
@@ -130,10 +128,11 @@ public class ExtContractServiceImpl implements ExtContractService {
        if (!projectDetail.getProjectManagerName().equals(projectManager)){
            throw exception(PARAM_ERROR);
        }
-        String name = customerCompanyMapper.selectById(createReqVO.getCustomerCompanyId()).getName();
-        if (!name.equals(customerCompanyName)){
-            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);
        }
@@ -243,7 +242,7 @@ public class ExtContractServiceImpl implements ExtContractService {
            throw exception(PROJECT_NOT_EXISTS);
        }

-        Long customerCompanyId = extContractDO.getCustomerCompanyId();
+        //Long customerCompanyId = extContractDO.getCustomerCompanyId();
        ExtContractRespVO extContractRespVO = BeanUtils.toBean(extContractDO, ExtContractRespVO.class);


@@ -255,9 +254,9 @@ public class ExtContractServiceImpl implements ExtContractService {
        extContractRespVO.setProjectManager(projectDetail.getProjectManagerName());

        //用客户公司id查询
-        CustomerCompanyDO customerCompanyDO = customerCompanyMapper.selectById(customerCompanyId);
-        String name = customerCompanyDO.getName();
-        extContractRespVO.setCustomerCompanyName(name);
+        //CustomerCompanyDO customerCompanyDO = customerCompanyMapper.selectById(customerCompanyId);
+        //String name = customerCompanyDO.getName();
+        //extContractRespVO.setCustomerCompanyName(name);


        //合同总金额
@@ -307,8 +306,9 @@ public class ExtContractServiceImpl implements ExtContractService {
        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);
+        //BigDecimal other = new BigDecimal(extContract.getOtherFee());
+        //return preAmount.add(designFee).add(surveyFees).add(testingFee).add(other);
+        return  null;
    }

    @Override
@@ -318,8 +318,8 @@ public class ExtContractServiceImpl implements ExtContractService {
        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 preAmount.add(designFee).add(surveyFees).add(testingFee).add(other);
+        //BigDecimal other = new BigDecimal(extContractSaveReqVO.getOtherFee());
+        return null;
    }

    @Override