From 9d82236a899b37e90918acad4c7f03cc55329e97 Mon Sep 17 00:00:00 2001 From: wyw <13885678+wyw0828@user.noreply.gitee.com> Date: Fri, 26 Jul 2024 10:25:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E4=B9=8B=E5=89=8D=E6=8F=90=E4=BA=A4=E5=88=B0=E4=BA=86?= =?UTF-8?q?7.22=E5=88=86=E6=94=AF=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extContract/ExtContractService.java | 63 ++++++++ .../extContract/ExtContractServiceImpl.java | 145 ++++++++++++++++++ 2 files changed, 208 insertions(+) create mode 100644 yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractService.java create mode 100644 yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractServiceImpl.java diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractService.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractService.java new file mode 100644 index 000000000..f457c5f6d --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractService.java @@ -0,0 +1,63 @@ +package cn.iocoder.yudao.module.cms.service.extcontract; + + +import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractPageReqVO; +import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractRespVO; +import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractSaveReqVO; +import jakarta.validation.*; +import cn.iocoder.yudao.framework.common.pojo.PageResult; + +import java.math.BigDecimal; + +/** + * 外部合同 Service 接口 + * + * @author 管理员 + */ +public interface ExtContractService { + + /** + * 创建外部合同 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createExtContract(@Valid ExtContractSaveReqVO createReqVO); + + /** + * 更新外部合同 + * + * @param updateReqVO 更新信息 + */ + void updateExtContract(@Valid ExtContractSaveReqVO updateReqVO); + + /** + * 删除外部合同 + * + * @param id 编号 + */ + void deleteExtContract(Long id); + + /** + * 获得外部合同 + * + * @param id 编号 + * @return 外部合同 + */ + ExtContractRespVO getExtContract(Long id); + + /** + * 获得外部合同分页 + * + * @param pageReqVO 分页查询 + * @return 外部合同分页 + */ + PageResult getExtContractPage(ExtContractPageReqVO pageReqVO); + + /** + * 合同总金额 + * @param id + * @return + */ + BigDecimal getContractAmount(Long id); +} \ No newline at end of file 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 new file mode 100644 index 000000000..95d79bdc6 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractServiceImpl.java @@ -0,0 +1,145 @@ +package cn.iocoder.yudao.module.cms.service.extcontract; + +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.customerCompany.CustomerCompanyDO; +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.dto.ProjectDetailRespDTO; +import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO; +import org.springframework.stereotype.Service; +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; + +/** + * 外部合同 Service 实现类 + * + * @author 管理员 + */ +@Service +@Validated +public class ExtContractServiceImpl implements ExtContractService { + + @Resource + private ExtContractMapper extContractMapper; + + @Resource + private ProjectApi projectApi; + + @Resource + private CustomerCompanyMapper customerCompanyMapper; + + + @Override + public Long createExtContract(ExtContractSaveReqVO createReqVO) { + // 插入 + ExtContractDO extContract = BeanUtils.toBean(createReqVO, ExtContractDO.class); + extContractMapper.insert(extContract); + // 返回 + return extContract.getId(); + } + + @Override + public void updateExtContract(ExtContractSaveReqVO updateReqVO) { + //校验 + Long id = updateReqVO.getId(); + validateExtContractExists(id); + // 更新 + ExtContractDO updateObj = BeanUtils.toBean(updateReqVO, ExtContractDO.class); + extContractMapper.updateById(updateObj); + } + + @Override + public void deleteExtContract(Long id) { + // 校验存在 + validateExtContractExists(id); + // 删除 + extContractMapper.deleteById(id); + } + + private void validateExtContractExists(Long id) { + if (extContractMapper.selectById(id) == null) { + throw exception(EXT_CONTRACT_NOT_EXISTS); + } + } + + // 需要联表查询 + // 1.项目编号 pms_project 直接 √ + // 2.主控部门(跟踪部门) pms_project找到的是id 需要联表 √ + // 3.项目经理 pms_project找到的是id 需要联表 √ + // 4.客户公司名称 pms_project 联表 √ + // 5.合同总金额 √ + // 6.合同商议提示（和分包提示不一样） + @Override + public ExtContractRespVO getExtContract(Long id) { + ExtContractDO extContractDO = extContractMapper.selectById(id); + Long projectId = extContractDO.getProjectId(); + Long customerCompanyId = extContractDO.getCustomerCompanyId(); + ExtContractRespVO extContractRespVO = BeanUtils.toBean(extContractDO, ExtContractRespVO.class); + + + ProjectRespDTO project = projectApi.getProject(projectId); + extContractRespVO.setCode(project.getCode()); + + + ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId); + extContractRespVO.setTrackingDep(projectDetail.getTrackingDepName()); + extContractRespVO.setProjectManager(projectDetail.getProjectManagerName()); + + //用客户公司id查询 + CustomerCompanyDO customerCompanyDO = customerCompanyMapper.selectById(customerCompanyId); + String name = customerCompanyDO.getName(); + extContractRespVO.setCustomerCompanyName(name); + + + //合同总金额 + BigDecimal contractAmount = getContractAmount(id); + extContractRespVO.setAmount(contractAmount); + + + return extContractRespVO; + } + + @Override + public PageResult getExtContractPage(ExtContractPageReqVO pageReqVO) { + + PageResult extContractDOPageResult = extContractMapper.selectPage(pageReqVO); + List excontractDOList = extContractDOPageResult.getList(); + List extContractRespVOList = new ArrayList<>(); + + + for (ExtContractDO extContractDO : excontractDOList) { + Long id = extContractDO.getId(); + ExtContractRespVO extContractRespVO = getExtContract(id); + extContractRespVOList.add(extContractRespVO); + } + PageResult pageResult = new PageResult<>(); + pageResult.setList(extContractRespVOList); + return pageResult; + } + + @Override + public BigDecimal getContractAmount(Long id) { + //前期+设计+地勘+其他+检测 + ExtContractDO extContract = extContractMapper.selectById(id); + BigDecimal preAmount = new BigDecimal(String.valueOf(extContract.getPreAmount())); + BigDecimal designFee = new BigDecimal(String.valueOf(extContract.getDesignFee())); + BigDecimal surveyFees = new BigDecimal(String.valueOf(extContract.getSurveyFees())); + BigDecimal testingFee = new BigDecimal(String.valueOf(extContract.getTestingFee())); + BigDecimal other = new BigDecimal(extContract.getOtherFee()); + return preAmount.add(designFee).add(surveyFees).add(testingFee).add(other); + } + +} \ No newline at end of file From 47adca83945e177625576d0c989539af7194c288 Mon Sep 17 00:00:00 2001 From: wyw <13885678+wyw0828@user.noreply.gitee.com> Date: Fri, 26 Jul 2024 11:10:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=90=88?= =?UTF-8?q?=E5=90=8C=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/cms/enums/ErrorCodeConstants.java | 4 +++ .../admin/contract/vo/ContractSaveReqVO.java | 31 ++++++++++++++++- .../service/contract/ContractServiceImpl.java | 33 +++++++++++++++---- 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java index bcafe95a6..e0a8ce4ed 100644 --- a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java @@ -31,5 +31,9 @@ public interface ErrorCodeConstants { // ========== 外包合同关联 2_023_000_000 ========== ErrorCode CONTRACT_OUTS_NOT_EXISTS = new ErrorCode(2_023_000_000, "外包合同关联不存在"); + ErrorCode PROJECT_NOT_EXISTS = new ErrorCode(1_021_000_000, "项目信息不存在"); + + + } diff --git 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 index e991e0581..fdf3a1025 100644 --- 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,4 +1,5 @@ package cn.iocoder.yudao.module.cms.controller.admin.contract.vo; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import jakarta.validation.constraints.*; @@ -12,9 +13,37 @@ public class ContractSaveReqVO { @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED) private Long id; - @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456") + @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456") private Long projectId; + @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001") + @ExcelProperty("项目编号") + private String code; + + @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 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 = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") @NotEmpty(message = "合同名称不能为空") private String name; diff --git 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 index fd3824b24..098f0b031 100644 --- 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 @@ -45,15 +45,28 @@ public class ContractServiceImpl implements ContractService { @Override public Long createContract(ContractSaveReqVO createReqVO) { - // 插入 ContractDO contract = BeanUtils.toBean(createReqVO, ContractDO.class); - contractMapper.insert(contract); + Long projectId = createReqVO.getProjectId(); + if (projectId != null) { + //进行更新 + updateContract(createReqVO); + }else{ + //插入 + contractMapper.insert(contract); + } + // 返回 return contract.getId(); } @Override public void updateContract(ContractSaveReqVO updateReqVO) { + Long id = updateReqVO.getId(); + validateContractExists(id); + Long projectId = updateReqVO.getProjectId(); + if (projectId == null){ + throw exception(CONTRACT_NOT_EXISTS); + } // 更新 ContractDO updateObj = BeanUtils.toBean(updateReqVO, ContractDO.class); contractMapper.updateById(updateObj); @@ -67,17 +80,16 @@ public class ContractServiceImpl implements ContractService { contractMapper.deleteById(id); } - private void validateContractExists(Long projectId) { - if (contractMapper.selectById(projectId) == null) { - throw exception(CONTRACT_NOT_EXISTS); - } - } @Override public ContractRespVO getContract(Long id) { ContractDO contractDO = contractMapper.selectById(id); Long projectId = contractDO.getProjectId(); + //校验 + if (projectId == null){ + throw exception(PROJECT_NOT_EXISTS); + } ContractRespVO contractRespVO = BeanUtils.toBean(contractDO, ContractRespVO.class); // 需要联表查询 @@ -144,4 +156,11 @@ public class ContractServiceImpl implements ContractService { } + private void validateContractExists(Long projectId) { + if (contractMapper.selectById(projectId) == null) { + throw exception(CONTRACT_NOT_EXISTS); + } + } + + } \ No newline at end of file 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 3/4] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=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 From 73d09ffea0c87bce0db7dbc551551a23be506c41 Mon Sep 17 00:00:00 2001 From: wyw <13885678+wyw0828@user.noreply.gitee.com> Date: Fri, 26 Jul 2024 11:34:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=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 --- .../mysql/{extContract => extcontract}/ExtContractMapper.java | 2 +- .../module/cms/service/extcontract/ExtContractServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/{extContract => extcontract}/ExtContractMapper.java (98%) diff --git 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 similarity index 98% rename from yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extContract/ExtContractMapper.java rename to yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extcontract/ExtContractMapper.java index d31fb793d..5811556ef 100644 --- 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 @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.cms.dal.mysql.extContract; +package cn.iocoder.yudao.module.cms.dal.mysql.extcontract; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 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 11bbe83d1..5035231a1 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 @@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractSa 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.mysql.customerCompany.CustomerCompanyMapper; -import cn.iocoder.yudao.module.cms.dal.mysql.extContract.ExtContractMapper; +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.dto.ProjectDetailRespDTO; import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;