From 871ddf4aab8f90a809bfb2ff7260aa72db66f29b Mon Sep 17 00:00:00 2001 From: wyw <13885678+wyw0828@user.noreply.gitee.com> Date: Fri, 26 Jul 2024 11:15:31 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extContract/vo/ExtContractRespVO.java | 15 ++++----- .../extContract/vo/ExtContractSaveReqVO.java | 33 ++++++++++++++++--- .../extcontract/ExtContractServiceImpl.java | 13 +++++--- .../extContract}/ExtContractMapper.xml | 0 4 files changed, 44 insertions(+), 17 deletions(-) rename yudao-module-cms/yudao-module-cms-biz/src/main/resources/{mapper.extcontract => mapper/extContract}/ExtContractMapper.xml (100%) diff --git 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 index 40e79252c..6a0492f1c 100644 --- 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 @@ -17,7 +17,6 @@ public class ExtContractRespVO { @ExcelProperty("项目编号") private String code; - @Schema(description = "合同名称", example = "芋艿") @ExcelProperty("合同名称") private String name; @@ -39,9 +38,10 @@ public class ExtContractRespVO { @ExcelProperty("项目经理") private String projectManager; - @Schema(description = "分包合同提示时间") - @ExcelProperty("分包合同提示时间") - private LocalDateTime reminderTime; + @Schema(description = "合同提示时间") + @ExcelProperty("合同提示时间") + private LocalDateTime exReminderTime; + @Schema(description = "合同进展") @ExcelProperty("合同进展") @@ -107,10 +107,9 @@ public class ExtContractRespVO { @ExcelProperty("资金来源") private String source; - - @Schema(description = "合同提示时间") - @ExcelProperty("合同提示时间") - private LocalDateTime exReminderTime; + @Schema(description = "分包合同提示时间") + @ExcelProperty("分包合同提示时间") + private LocalDateTime reminderTime; @Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("收费标准") diff --git 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 index 6a9c89a1e..3c906f8f6 100644 --- 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,5 +1,6 @@ package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import jakarta.validation.constraints.*; @@ -18,15 +19,39 @@ public class ExtContractSaveReqVO { @NotNull(message = "项目id不能为空") private Long projectId; - @Schema(description = "合同名称", example = "芋艿") - private String name; + @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001") + @ExcelProperty("项目编号") + private String code; - @Schema(description = "合同类型", example = "1") - private String type; + @Schema(description = "客户名称") + @ExcelProperty("客户名称") + private String customerCompanyName; + + @Schema(description = "主控部门", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产一部") + @ExcelProperty("主控部门") + private String trackingDep; + + @Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("项目经理") + private String projectManager; + + @Schema(description = "合同提示时间") + @ExcelProperty("合同提示时间") + private LocalDateTime exReminderTime; @Schema(description = "客户公司id", example = "25191") private Long customerCompanyId; + + + @Schema(description = "合同名称", example = "芋艿") + @ExcelProperty("合同名称") + private String name; + + @Schema(description = "合同类型", example = "1") + @ExcelProperty("合同类型") + private String type; + @Schema(description = "合同进展") private String progress; diff --git 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 index 95d79bdc6..11bbe83d1 100644 --- 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 @@ -15,11 +15,9 @@ import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; - import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.EXT_CONTRACT_NOT_EXISTS; @@ -44,10 +42,15 @@ public class ExtContractServiceImpl implements ExtContractService { @Override public Long createExtContract(ExtContractSaveReqVO createReqVO) { - // 插入 + Long projectId = createReqVO.getProjectId(); ExtContractDO extContract = BeanUtils.toBean(createReqVO, ExtContractDO.class); - extContractMapper.insert(extContract); - // 返回 + if (projectId != null) { + updateExtContract(createReqVO); + } else { + // 插入 + extContractMapper.insert(extContract); + } + return extContract.getId(); } diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper.extcontract/ExtContractMapper.xml b/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/extContract/ExtContractMapper.xml similarity index 100% rename from yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper.extcontract/ExtContractMapper.xml rename to yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/extContract/ExtContractMapper.xml