From 82f03fa27373498cb285afa748036876460ac8d8 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 29 Jan 2026 17:13:33 +0800 Subject: [PATCH] =?UTF-8?q?1.0.63=20add=E5=90=88=E5=90=8C=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpContractPaymentMethodController.java | 116 +++++++++++++ .../ErpContractPaymentStageController.java | 116 ------------- .../erp/domain/ErpContractPaymentMethod.java | 88 ++++++++++ .../erp/domain/ErpContractPaymentStage.java | 109 ------------ .../domain/bo/ErpContractPaymentMethodBo.java | 84 ++++++++++ .../domain/bo/ErpContractPaymentStageBo.java | 103 ------------ .../domain/vo/ErpContractPaymentMethodVo.java | 100 +++++++++++ .../domain/vo/ErpContractPaymentStageVo.java | 157 ------------------ .../ErpContractPaymentMethodMapper.java | 37 +++++ .../mapper/ErpContractPaymentStageMapper.java | 37 ----- .../IErpContractPaymentMethodService.java | 69 ++++++++ .../IErpContractPaymentStageService.java | 69 -------- .../ErpContractPaymentMethodServiceImpl.java | 141 ++++++++++++++++ .../ErpContractPaymentStageServiceImpl.java | 144 ---------------- .../oa/erp/ErpContractPaymentMethodMapper.xml | 14 ++ .../oa/erp/ErpContractPaymentStageMapper.xml | 36 ---- 16 files changed, 649 insertions(+), 771 deletions(-) create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractPaymentMethodController.java delete mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractPaymentStageController.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractPaymentMethod.java delete mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractPaymentStage.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractPaymentMethodBo.java delete mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractPaymentStageBo.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractPaymentMethodVo.java delete mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractPaymentStageVo.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractPaymentMethodMapper.java delete mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractPaymentStageMapper.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractPaymentMethodService.java delete mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractPaymentStageService.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentMethodServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentStageServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractPaymentMethodMapper.xml delete mode 100644 ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractPaymentStageMapper.xml diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractPaymentMethodController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractPaymentMethodController.java new file mode 100644 index 00000000..cabcd2d6 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractPaymentMethodController.java @@ -0,0 +1,116 @@ +package org.dromara.oa.erp.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.oa.erp.domain.vo.ErpContractPaymentMethodVo; +import org.dromara.oa.erp.domain.bo.ErpContractPaymentMethodBo; +import org.dromara.oa.erp.service.IErpContractPaymentMethodService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 合同付款方式 + * 前端访问路由地址为:/oa/erp/contractPaymentMethod + * + * @author Yinq + * @date 2026-01-29 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/erp/contractPaymentMethod") +public class ErpContractPaymentMethodController extends BaseController { + + private final IErpContractPaymentMethodService erpContractPaymentMethodService; + + /** + * 查询合同付款方式列表 + */ + @SaCheckPermission("oa/erp:contractPaymentMethod:list") + @GetMapping("/list") + public TableDataInfo list(ErpContractPaymentMethodBo bo, PageQuery pageQuery) { + return erpContractPaymentMethodService.queryPageList(bo, pageQuery); + } + + /** + * 导出合同付款方式列表 + */ + @SaCheckPermission("oa/erp:contractPaymentMethod:export") + @Log(title = "合同付款方式", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ErpContractPaymentMethodBo bo, HttpServletResponse response) { + List list = erpContractPaymentMethodService.queryList(bo); + ExcelUtil.exportExcel(list, "合同付款方式", ErpContractPaymentMethodVo.class, response); + } + + /** + * 获取合同付款方式详细信息 + * + * @param paymentMethodId 主键 + */ + @SaCheckPermission("oa/erp:contractPaymentMethod:query") + @GetMapping("/{paymentMethodId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("paymentMethodId") Long paymentMethodId) { + return R.ok(erpContractPaymentMethodService.queryById(paymentMethodId)); + } + + /** + * 新增合同付款方式 + */ + @SaCheckPermission("oa/erp:contractPaymentMethod:add") + @Log(title = "合同付款方式", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ErpContractPaymentMethodBo bo) { + return toAjax(erpContractPaymentMethodService.insertByBo(bo)); + } + + /** + * 修改合同付款方式 + */ + @SaCheckPermission("oa/erp:contractPaymentMethod:edit") + @Log(title = "合同付款方式", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ErpContractPaymentMethodBo bo) { + return toAjax(erpContractPaymentMethodService.updateByBo(bo)); + } + + /** + * 删除合同付款方式 + * + * @param paymentMethodIds 主键串 + */ + @SaCheckPermission("oa/erp:contractPaymentMethod:remove") + @Log(title = "合同付款方式", businessType = BusinessType.DELETE) + @DeleteMapping("/{paymentMethodIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("paymentMethodIds") Long[] paymentMethodIds) { + return toAjax(erpContractPaymentMethodService.deleteWithValidByIds(List.of(paymentMethodIds), true)); + } + + /** + * 下拉框查询合同付款方式列表 + */ + @GetMapping("/getErpContractPaymentMethodList") + public R> getErpContractPaymentMethodList(ErpContractPaymentMethodBo bo) { + List list = erpContractPaymentMethodService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractPaymentStageController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractPaymentStageController.java deleted file mode 100644 index 2f3cb0d1..00000000 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractPaymentStageController.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.dromara.oa.erp.controller; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.oa.erp.domain.vo.ErpContractPaymentStageVo; -import org.dromara.oa.erp.domain.bo.ErpContractPaymentStageBo; -import org.dromara.oa.erp.service.IErpContractPaymentStageService; -import org.dromara.common.mybatis.core.page.TableDataInfo; - -/** - * 合同回款阶段 - * 前端访问路由地址为:/oa/erp/contractPaymentStage - * - * @author Yinq - * @date 2025-12-11 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/erp/contractPaymentStage") -public class ErpContractPaymentStageController extends BaseController { - - private final IErpContractPaymentStageService erpContractPaymentStageService; - - /** - * 查询合同回款阶段列表 - */ - @SaCheckPermission("oa/erp:contractPaymentStage:list") - @GetMapping("/list") - public TableDataInfo list(ErpContractPaymentStageBo bo, PageQuery pageQuery) { - return erpContractPaymentStageService.queryPageList(bo, pageQuery); - } - - /** - * 导出合同回款阶段列表 - */ - @SaCheckPermission("oa/erp:contractPaymentStage:export") - @Log(title = "合同回款阶段", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(ErpContractPaymentStageBo bo, HttpServletResponse response) { - List list = erpContractPaymentStageService.queryList(bo); - ExcelUtil.exportExcel(list, "合同回款阶段", ErpContractPaymentStageVo.class, response); - } - - /** - * 获取合同回款阶段详细信息 - * - * @param contractStageId 主键 - */ - @SaCheckPermission("oa/erp:contractPaymentStage:query") - @GetMapping("/{contractStageId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("contractStageId") Long contractStageId) { - return R.ok(erpContractPaymentStageService.queryById(contractStageId)); - } - - /** - * 新增合同回款阶段 - */ - @SaCheckPermission("oa/erp:contractPaymentStage:add") - @Log(title = "合同回款阶段", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody ErpContractPaymentStageBo bo) { - return toAjax(erpContractPaymentStageService.insertByBo(bo)); - } - - /** - * 修改合同回款阶段 - */ - @SaCheckPermission("oa/erp:contractPaymentStage:edit") - @Log(title = "合同回款阶段", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody ErpContractPaymentStageBo bo) { - return toAjax(erpContractPaymentStageService.updateByBo(bo)); - } - - /** - * 删除合同回款阶段 - * - * @param contractStageIds 主键串 - */ - @SaCheckPermission("oa/erp:contractPaymentStage:remove") - @Log(title = "合同回款阶段", businessType = BusinessType.DELETE) - @DeleteMapping("/{contractStageIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable("contractStageIds") Long[] contractStageIds) { - return toAjax(erpContractPaymentStageService.deleteWithValidByIds(List.of(contractStageIds), true)); - } - - /** - * 下拉框查询合同回款阶段列表 - */ - @GetMapping("/getErpContractPaymentStageList") - public R> getErpContractPaymentStageList(ErpContractPaymentStageBo bo) { - List list = erpContractPaymentStageService.queryList(bo); - return R.ok(list); - } - -} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractPaymentMethod.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractPaymentMethod.java new file mode 100644 index 00000000..e745a814 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractPaymentMethod.java @@ -0,0 +1,88 @@ +package org.dromara.oa.erp.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 合同付款方式对象 erp_contract_payment_method + * + * @author Yinq + * @date 2026-01-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("erp_contract_payment_method") +public class ErpContractPaymentMethod extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 付款方式ID + */ + @TableId(value = "payment_method_id", type = IdType.ASSIGN_ID) + private Long paymentMethodId; + + /** + * 合同ID + */ + private Long contractId; + + /** + * 排序号 + */ + private Long sortOrder; + + /** + * 付款节点ID + */ + private Long paymentStageId; + + /** + * 支付期限 + */ + private BigDecimal paymentDeadline; + + /** + * 支付比例 + */ + private BigDecimal paymentPercentage; + + /** + * 发票比例 + */ + private BigDecimal invoicePercentage; + + /** + * 支付金额 + */ + private BigDecimal paymentAmount; + + /** + * 付款条款 + */ + private String paymentDescription; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 删除标志（0代表存在 1代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractPaymentStage.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractPaymentStage.java deleted file mode 100644 index fdeb3ba7..00000000 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractPaymentStage.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.dromara.oa.erp.domain; - -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.io.Serial; - -/** - * 合同回款阶段对象 erp_contract_payment_stage - * - * @author Yinq - * @date 2025-12-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("erp_contract_payment_stage") -public class ErpContractPaymentStage extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 合同回款阶段ID - */ - @TableId(value = "contract_stage_id", type = IdType.AUTO) - private Long contractStageId; - - /** - * 合同ID - */ - private Long contractId; - - /** - * 回款阶段ID - */ - private Long paymentStageId; - - /** - * 阶段名称 - */ - private String stageName; - - /** - * 回款阶段 - */ - private String collectionStage; - - /** - * 回款比例(%) - */ - private Long repaymentRate; - - /** - * 预计回款日期 - */ - private Date expectRepaymentDate; - - /** - * 回款延期天数 - */ - private Long delayDay; - - /** - * 实际回款日期 - */ - private Date actualRepaymentDate; - - /** - * 回款标识（0否 1是） - */ - private String repaymentFlag; - - /** - * 原因说明 - */ - private String reasonsExplanation; - - /** - * 进度备注 - */ - private String scheduleRemark; - - /** - * 回款金额（预留） - */ - private Long repaymentAmount; - - /** - * 排序号 - */ - private Long sortOrder; - - /** - * 备注 - */ - private String remark; - - /** - * 删除标志（0代表存在 1代表删除） - */ - @TableLogic - private String delFlag; - - -} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractPaymentMethodBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractPaymentMethodBo.java new file mode 100644 index 00000000..2a9bf861 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractPaymentMethodBo.java @@ -0,0 +1,84 @@ +package org.dromara.oa.erp.domain.bo; + +import org.dromara.oa.erp.domain.ErpContractPaymentMethod; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; + +/** + * 合同付款方式业务对象 erp_contract_payment_method + * + * @author Yinq + * @date 2026-01-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ErpContractPaymentMethod.class, reverseConvertGenerate = false) +public class ErpContractPaymentMethodBo extends BaseEntity { + + /** + * 付款方式ID + */ + private Long paymentMethodId; + + /** + * 合同ID + */ + private Long contractId; + + /** + * 排序号 + */ + private Long sortOrder; + + /** + * 付款节点ID + */ + @NotNull(message = "付款节点ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long paymentStageId; + + /** + * 支付期限 + */ + @NotNull(message = "支付期限不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal paymentDeadline; + + /** + * 支付比例 + */ + @NotNull(message = "支付比例不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal paymentPercentage; + + /** + * 发票比例 + */ + @NotNull(message = "发票比例不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal invoicePercentage; + + /** + * 支付金额 + */ + private BigDecimal paymentAmount; + + /** + * 付款条款 + */ + private String paymentDescription; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractPaymentStageBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractPaymentStageBo.java deleted file mode 100644 index 286198d6..00000000 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractPaymentStageBo.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.dromara.oa.erp.domain.bo; - -import org.dromara.oa.erp.domain.ErpContractPaymentStage; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; - -/** - * 合同回款阶段业务对象 erp_contract_payment_stage - * - * @author Yinq - * @date 2025-12-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = ErpContractPaymentStage.class, reverseConvertGenerate = false) -public class ErpContractPaymentStageBo extends BaseEntity { - - /** - * 合同回款阶段ID - */ - private Long contractStageId; - - /** - * 合同ID - */ - @NotNull(message = "合同ID不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long contractId; - - /** - * 回款阶段ID - */ - @NotNull(message = "回款阶段ID不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long paymentStageId; - - /** - * 阶段名称 - */ - private String stageName; - - /** - * 回款阶段 - */ - private String collectionStage; - - /** - * 回款比例(%) - */ - private Long repaymentRate; - - /** - * 预计回款日期 - */ - private Date expectRepaymentDate; - - /** - * 回款延期天数 - */ - private Long delayDay; - - /** - * 实际回款日期 - */ - private Date actualRepaymentDate; - - /** - * 回款标识（0否 1是） - */ - private String repaymentFlag; - - /** - * 原因说明 - */ - private String reasonsExplanation; - - /** - * 进度备注 - */ - private String scheduleRemark; - - /** - * 回款金额（预留） - */ - private Long repaymentAmount; - - /** - * 排序号 - */ - private Long sortOrder; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractPaymentMethodVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractPaymentMethodVo.java new file mode 100644 index 00000000..96e8101a --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractPaymentMethodVo.java @@ -0,0 +1,100 @@ +package org.dromara.oa.erp.domain.vo; + +import java.math.BigDecimal; + +import org.dromara.oa.erp.domain.ErpContractPaymentMethod; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 合同付款方式视图对象 erp_contract_payment_method + * + * @author Yinq + * @date 2026-01-29 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ErpContractPaymentMethod.class) +public class ErpContractPaymentMethodVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 付款方式ID + */ + @ExcelProperty(value = "付款方式ID") + private Long paymentMethodId; + + /** + * 合同ID + */ + @ExcelProperty(value = "合同ID") + private Long contractId; + + /** + * 排序号 + */ + @ExcelProperty(value = "排序号") + private Long sortOrder; + + /** + * 付款节点ID + */ + @ExcelProperty(value = "付款节点ID") + private Long paymentStageId; + + /** + * 支付期限 + */ + @ExcelProperty(value = "支付期限") + private BigDecimal paymentDeadline; + + /** + * 支付比例 + */ + @ExcelProperty(value = "支付比例") + private BigDecimal paymentPercentage; + + /** + * 发票比例 + */ + @ExcelProperty(value = "发票比例") + private BigDecimal invoicePercentage; + + /** + * 支付金额 + */ + @ExcelProperty(value = "支付金额") + private BigDecimal paymentAmount; + + /** + * 付款条款 + */ + @ExcelProperty(value = "付款条款") + private String paymentDescription; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=是,0=否") + private String activeFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractPaymentStageVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractPaymentStageVo.java deleted file mode 100644 index 96363f17..00000000 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractPaymentStageVo.java +++ /dev/null @@ -1,157 +0,0 @@ -package org.dromara.oa.erp.domain.vo; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.oa.erp.domain.ErpContractPaymentStage; -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; -import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - - -/** - * 合同回款阶段视图对象 erp_contract_payment_stage - * - * @author Yinq - * @date 2025-12-11 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = ErpContractPaymentStage.class) -public class ErpContractPaymentStageVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 合同回款阶段ID - */ - @ExcelProperty(value = "合同回款阶段ID") - private Long contractStageId; - - /** - * 合同ID - */ - @ExcelProperty(value = "合同ID") - private Long contractId; - - /** - * 回款阶段ID - */ - @ExcelProperty(value = "回款阶段ID") - private Long paymentStageId; - - /** - * 阶段名称 - */ - @ExcelProperty(value = "阶段名称") - private String stageName; - - /** - * 回款阶段 - */ - @ExcelProperty(value = "回款阶段", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "collection_stage") - private String collectionStage; - - /** - * 回款比例(%) - */ - @ExcelProperty(value = "回款比例(%)") - private Long repaymentRate; - - /** - * 预计回款日期 - */ - @ExcelProperty(value = "预计回款日期") - private Date expectRepaymentDate; - - /** - * 回款延期天数 - */ - @ExcelProperty(value = "回款延期天数") - private Long delayDay; - - /** - * 实际回款日期 - */ - @ExcelProperty(value = "实际回款日期") - private Date actualRepaymentDate; - - /** - * 回款标识（0否 1是） - */ - @ExcelProperty(value = "回款标识", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=否,1=是") - private String repaymentFlag; - - /** - * 原因说明 - */ - @ExcelProperty(value = "原因说明") - private String reasonsExplanation; - - /** - * 进度备注 - */ - @ExcelProperty(value = "进度备注") - private String scheduleRemark; - - /** - * 回款金额（预留） - */ - @ExcelProperty(value = "回款金额", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "预=留") - private Long repaymentAmount; - - /** - * 排序号 - */ - @ExcelProperty(value = "排序号") - private Long sortOrder; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 创建部门 - */ - @ExcelProperty(value = "创建部门") - private Long createDept; - - /** - * 创建者 - */ - @ExcelProperty(value = "创建者") - private Long createBy; - - /** - * 创建时间 - */ - @ExcelProperty(value = "创建时间") - private Date createTime; - - /** - * 更新者 - */ - @ExcelProperty(value = "更新者") - private Long updateBy; - - /** - * 更新时间 - */ - @ExcelProperty(value = "更新时间") - private Date updateTime; - - -} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractPaymentMethodMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractPaymentMethodMapper.java new file mode 100644 index 00000000..1b2909e5 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractPaymentMethodMapper.java @@ -0,0 +1,37 @@ +package org.dromara.oa.erp.mapper; + +import java.util.List; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.oa.erp.domain.ErpContractPaymentMethod; +import org.dromara.oa.erp.domain.vo.ErpContractPaymentMethodVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 合同付款方式Mapper接口 + * + * @author Yinq + * @date 2026-01-29 + */ +public interface ErpContractPaymentMethodMapper extends BaseMapperPlus { + + /** + * 查询合同付款方式列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 合同付款方式集合 + */ + public Page selectCustomErpContractPaymentMethodVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询合同付款方式列表 + * + * @param queryWrapper 条件 + * @return 合同付款方式集合 + */ + public List selectCustomErpContractPaymentMethodVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractPaymentStageMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractPaymentStageMapper.java deleted file mode 100644 index 791bd568..00000000 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractPaymentStageMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.oa.erp.mapper; - -import java.util.List; -import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.dromara.oa.erp.domain.ErpContractPaymentStage; -import org.dromara.oa.erp.domain.vo.ErpContractPaymentStageVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 合同回款阶段Mapper接口 - * - * @author Yinq - * @date 2025-12-11 - */ -public interface ErpContractPaymentStageMapper extends BaseMapperPlus { - - /** - * 查询合同回款阶段列表 - * - * @param page 分页 - * @param queryWrapper 条件 - * @return 合同回款阶段集合 - */ - public Page selectCustomErpContractPaymentStageVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); - - /** - * 查询合同回款阶段列表 - * - * @param queryWrapper 条件 - * @return 合同回款阶段集合 - */ - public List selectCustomErpContractPaymentStageVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); - -} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractPaymentMethodService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractPaymentMethodService.java new file mode 100644 index 00000000..5ecf887c --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractPaymentMethodService.java @@ -0,0 +1,69 @@ +package org.dromara.oa.erp.service; + +import org.dromara.oa.erp.domain.ErpContractPaymentMethod; +import org.dromara.oa.erp.domain.vo.ErpContractPaymentMethodVo; +import org.dromara.oa.erp.domain.bo.ErpContractPaymentMethodBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 合同付款方式Service接口 + * + * @author Yinq + * @date 2026-01-29 + */ +public interface IErpContractPaymentMethodService { + + /** + * 查询合同付款方式 + * + * @param paymentMethodId 主键 + * @return 合同付款方式 + */ + ErpContractPaymentMethodVo queryById(Long paymentMethodId); + + /** + * 分页查询合同付款方式列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同付款方式分页列表 + */ + TableDataInfo queryPageList(ErpContractPaymentMethodBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的合同付款方式列表 + * + * @param bo 查询条件 + * @return 合同付款方式列表 + */ + List queryList(ErpContractPaymentMethodBo bo); + + /** + * 新增合同付款方式 + * + * @param bo 合同付款方式 + * @return 是否新增成功 + */ + Boolean insertByBo(ErpContractPaymentMethodBo bo); + + /** + * 修改合同付款方式 + * + * @param bo 合同付款方式 + * @return 是否修改成功 + */ + Boolean updateByBo(ErpContractPaymentMethodBo bo); + + /** + * 校验并批量删除合同付款方式信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractPaymentStageService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractPaymentStageService.java deleted file mode 100644 index b5e98d5f..00000000 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractPaymentStageService.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.dromara.oa.erp.service; - -import org.dromara.oa.erp.domain.ErpContractPaymentStage; -import org.dromara.oa.erp.domain.vo.ErpContractPaymentStageVo; -import org.dromara.oa.erp.domain.bo.ErpContractPaymentStageBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; - -import java.util.Collection; -import java.util.List; - -/** - * 合同回款阶段Service接口 - * - * @author Yinq - * @date 2025-12-11 - */ -public interface IErpContractPaymentStageService { - - /** - * 查询合同回款阶段 - * - * @param contractStageId 主键 - * @return 合同回款阶段 - */ - ErpContractPaymentStageVo queryById(Long contractStageId); - - /** - * 分页查询合同回款阶段列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 合同回款阶段分页列表 - */ - TableDataInfo queryPageList(ErpContractPaymentStageBo bo, PageQuery pageQuery); - - /** - * 查询符合条件的合同回款阶段列表 - * - * @param bo 查询条件 - * @return 合同回款阶段列表 - */ - List queryList(ErpContractPaymentStageBo bo); - - /** - * 新增合同回款阶段 - * - * @param bo 合同回款阶段 - * @return 是否新增成功 - */ - Boolean insertByBo(ErpContractPaymentStageBo bo); - - /** - * 修改合同回款阶段 - * - * @param bo 合同回款阶段 - * @return 是否修改成功 - */ - Boolean updateByBo(ErpContractPaymentStageBo bo); - - /** - * 校验并批量删除合同回款阶段信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); -} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentMethodServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentMethodServiceImpl.java new file mode 100644 index 00000000..5958bca6 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentMethodServiceImpl.java @@ -0,0 +1,141 @@ +package org.dromara.oa.erp.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; + import org.dromara.common.mybatis.core.page.TableDataInfo; + import org.dromara.common.mybatis.core.page.PageQuery; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.oa.erp.domain.bo.ErpContractPaymentMethodBo; +import org.dromara.oa.erp.domain.vo.ErpContractPaymentMethodVo; +import org.dromara.oa.erp.domain.ErpContractPaymentMethod; +import org.dromara.oa.erp.mapper.ErpContractPaymentMethodMapper; +import org.dromara.oa.erp.service.IErpContractPaymentMethodService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 合同付款方式Service业务层处理 + * + * @author Yinq + * @date 2026-01-29 + */ +@RequiredArgsConstructor +@Service +public class ErpContractPaymentMethodServiceImpl implements IErpContractPaymentMethodService { + + private final ErpContractPaymentMethodMapper baseMapper; + + /** + * 查询合同付款方式 + * + * @param paymentMethodId 主键 + * @return 合同付款方式 + */ + @Override + public ErpContractPaymentMethodVo queryById(Long paymentMethodId){ + return baseMapper.selectVoById(paymentMethodId); + } + + /** + * 分页查询合同付款方式列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同付款方式分页列表 + */ + @Override + public TableDataInfo queryPageList(ErpContractPaymentMethodBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的合同付款方式列表 + * + * @param bo 查询条件 + * @return 合同付款方式列表 + */ + @Override + public List queryList(ErpContractPaymentMethodBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ErpContractPaymentMethodBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractPaymentMethod.class) + .selectAll(ErpContractPaymentMethod.class) + .eq(ErpContractPaymentMethod::getDelFlag, "0") + .eq(bo.getContractId() != null, ErpContractPaymentMethod::getContractId, bo.getContractId()) + .eq(bo.getSortOrder() != null, ErpContractPaymentMethod::getSortOrder, bo.getSortOrder()) + .eq(bo.getPaymentStageId() != null, ErpContractPaymentMethod::getPaymentStageId, bo.getPaymentStageId()) + .eq(bo.getPaymentDeadline() != null, ErpContractPaymentMethod::getPaymentDeadline, bo.getPaymentDeadline()) + .eq(bo.getPaymentPercentage() != null, ErpContractPaymentMethod::getPaymentPercentage, bo.getPaymentPercentage()) + .eq(bo.getInvoicePercentage() != null, ErpContractPaymentMethod::getInvoicePercentage, bo.getInvoicePercentage()) + .eq(bo.getPaymentAmount() != null, ErpContractPaymentMethod::getPaymentAmount, bo.getPaymentAmount()) + .eq(StringUtils.isNotBlank(bo.getPaymentDescription()), ErpContractPaymentMethod::getPaymentDescription, bo.getPaymentDescription()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractPaymentMethod::getActiveFlag, bo.getActiveFlag()) +; + return lqw; + } + + /** + * 新增合同付款方式 + * + * @param bo 合同付款方式 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ErpContractPaymentMethodBo bo) { + ErpContractPaymentMethod add = MapstructUtils.convert(bo, ErpContractPaymentMethod.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPaymentMethodId(add.getPaymentMethodId()); + } + return flag; + } + + /** + * 修改合同付款方式 + * + * @param bo 合同付款方式 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ErpContractPaymentMethodBo bo) { + ErpContractPaymentMethod update = MapstructUtils.convert(bo, ErpContractPaymentMethod.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ErpContractPaymentMethod entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除合同付款方式信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentStageServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentStageServiceImpl.java deleted file mode 100644 index c1dbee0a..00000000 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentStageServiceImpl.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.dromara.oa.erp.service.impl; - -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.yulichang.toolkit.JoinWrappers; -import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.dromara.oa.erp.domain.bo.ErpContractPaymentStageBo; -import org.dromara.oa.erp.domain.vo.ErpContractPaymentStageVo; -import org.dromara.oa.erp.domain.ErpContractPaymentStage; -import org.dromara.oa.erp.mapper.ErpContractPaymentStageMapper; -import org.dromara.oa.erp.service.IErpContractPaymentStageService; - -import java.util.List; -import java.util.Map; -import java.util.Collection; - -/** - * 合同回款阶段Service业务层处理 - * - * @author Yinq - * @date 2025-12-11 - */ -@RequiredArgsConstructor -@Service -public class ErpContractPaymentStageServiceImpl implements IErpContractPaymentStageService { - - private final ErpContractPaymentStageMapper baseMapper; - - /** - * 查询合同回款阶段 - * - * @param contractStageId 主键 - * @return 合同回款阶段 - */ - @Override - public ErpContractPaymentStageVo queryById(Long contractStageId) { - return baseMapper.selectVoById(contractStageId); - } - - /** - * 分页查询合同回款阶段列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 合同回款阶段分页列表 - */ - @Override - public TableDataInfo queryPageList(ErpContractPaymentStageBo bo, PageQuery pageQuery) { - MPJLambdaWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询符合条件的合同回款阶段列表 - * - * @param bo 查询条件 - * @return 合同回款阶段列表 - */ - @Override - public List queryList(ErpContractPaymentStageBo bo) { - MPJLambdaWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private MPJLambdaWrapper buildQueryWrapper(ErpContractPaymentStageBo bo) { - Map params = bo.getParams(); - MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractPaymentStage.class) - .selectAll(ErpContractPaymentStage.class) - .eq(ErpContractPaymentStage::getDelFlag, "0") - .eq(bo.getContractId() != null, ErpContractPaymentStage::getContractId, bo.getContractId()) - .eq(bo.getPaymentStageId() != null, ErpContractPaymentStage::getPaymentStageId, bo.getPaymentStageId()) - .like(StringUtils.isNotBlank(bo.getStageName()), ErpContractPaymentStage::getStageName, bo.getStageName()) - .eq(StringUtils.isNotBlank(bo.getCollectionStage()), ErpContractPaymentStage::getCollectionStage, bo.getCollectionStage()) - .eq(bo.getRepaymentRate() != null, ErpContractPaymentStage::getRepaymentRate, bo.getRepaymentRate()) - .eq(bo.getExpectRepaymentDate() != null, ErpContractPaymentStage::getExpectRepaymentDate, bo.getExpectRepaymentDate()) - .eq(bo.getDelayDay() != null, ErpContractPaymentStage::getDelayDay, bo.getDelayDay()) - .eq(bo.getActualRepaymentDate() != null, ErpContractPaymentStage::getActualRepaymentDate, bo.getActualRepaymentDate()) - .eq(StringUtils.isNotBlank(bo.getRepaymentFlag()), ErpContractPaymentStage::getRepaymentFlag, bo.getRepaymentFlag()) - .eq(StringUtils.isNotBlank(bo.getReasonsExplanation()), ErpContractPaymentStage::getReasonsExplanation, bo.getReasonsExplanation()) - .eq(StringUtils.isNotBlank(bo.getScheduleRemark()), ErpContractPaymentStage::getScheduleRemark, bo.getScheduleRemark()) - .eq(bo.getRepaymentAmount() != null, ErpContractPaymentStage::getRepaymentAmount, bo.getRepaymentAmount()) - .eq(bo.getSortOrder() != null, ErpContractPaymentStage::getSortOrder, bo.getSortOrder()); - return lqw; - } - - /** - * 新增合同回款阶段 - * - * @param bo 合同回款阶段 - * @return 是否新增成功 - */ - @Override - public Boolean insertByBo(ErpContractPaymentStageBo bo) { - ErpContractPaymentStage add = MapstructUtils.convert(bo, ErpContractPaymentStage.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setContractStageId(add.getContractStageId()); - } - return flag; - } - - /** - * 修改合同回款阶段 - * - * @param bo 合同回款阶段 - * @return 是否修改成功 - */ - @Override - public Boolean updateByBo(ErpContractPaymentStageBo bo) { - ErpContractPaymentStage update = MapstructUtils.convert(bo, ErpContractPaymentStage.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(ErpContractPaymentStage entity) { - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 校验并批量删除合同回款阶段信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractPaymentMethodMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractPaymentMethodMapper.xml new file mode 100644 index 00000000..3abf3500 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractPaymentMethodMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractPaymentStageMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractPaymentStageMapper.xml deleted file mode 100644 index 18465323..00000000 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractPaymentStageMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - -