1.0.63 add合同付款方式

dev
yinq 5 days ago
parent 8b9f66dd12
commit 82f03fa273

@ -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<ErpContractPaymentMethodVo> 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<ErpContractPaymentMethodVo> list = erpContractPaymentMethodService.queryList(bo);
ExcelUtil.exportExcel(list, "合同付款方式", ErpContractPaymentMethodVo.class, response);
}
/**
*
*
* @param paymentMethodId
*/
@SaCheckPermission("oa/erp:contractPaymentMethod:query")
@GetMapping("/{paymentMethodId}")
public R<ErpContractPaymentMethodVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("paymentMethodIds") Long[] paymentMethodIds) {
return toAjax(erpContractPaymentMethodService.deleteWithValidByIds(List.of(paymentMethodIds), true));
}
/**
*
*/
@GetMapping("/getErpContractPaymentMethodList")
public R<List<ErpContractPaymentMethodVo>> getErpContractPaymentMethodList(ErpContractPaymentMethodBo bo) {
List<ErpContractPaymentMethodVo> list = erpContractPaymentMethodService.queryList(bo);
return R.ok(list);
}
}

@ -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<ErpContractPaymentStageVo> 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<ErpContractPaymentStageVo> list = erpContractPaymentStageService.queryList(bo);
ExcelUtil.exportExcel(list, "合同回款阶段", ErpContractPaymentStageVo.class, response);
}
/**
*
*
* @param contractStageId
*/
@SaCheckPermission("oa/erp:contractPaymentStage:query")
@GetMapping("/{contractStageId}")
public R<ErpContractPaymentStageVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("contractStageIds") Long[] contractStageIds) {
return toAjax(erpContractPaymentStageService.deleteWithValidByIds(List.of(contractStageIds), true));
}
/**
*
*/
@GetMapping("/getErpContractPaymentStageList")
public R<List<ErpContractPaymentStageVo>> getErpContractPaymentStageList(ErpContractPaymentStageBo bo) {
List<ErpContractPaymentStageVo> list = erpContractPaymentStageService.queryList(bo);
return R.ok(list);
}
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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<ErpContractPaymentMethod, ErpContractPaymentMethodVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<ErpContractPaymentMethodVo> selectCustomErpContractPaymentMethodVoList(@Param("page") Page<ErpContractPaymentMethodVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractPaymentMethod> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<ErpContractPaymentMethodVo> selectCustomErpContractPaymentMethodVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractPaymentMethod> queryWrapper);
}

@ -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<ErpContractPaymentStage, ErpContractPaymentStageVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<ErpContractPaymentStageVo> selectCustomErpContractPaymentStageVoList(@Param("page") Page<ErpContractPaymentStageVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractPaymentStage> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<ErpContractPaymentStageVo> selectCustomErpContractPaymentStageVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractPaymentStage> queryWrapper);
}

@ -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<ErpContractPaymentMethodVo> queryPageList(ErpContractPaymentMethodBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<ErpContractPaymentMethodVo> 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<Long> ids, Boolean isValid);
}

@ -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<ErpContractPaymentStageVo> queryPageList(ErpContractPaymentStageBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<ErpContractPaymentStageVo> 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<Long> ids, Boolean isValid);
}

@ -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<ErpContractPaymentMethodVo> queryPageList(ErpContractPaymentMethodBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<ErpContractPaymentMethod> lqw = buildQueryWrapper(bo);
Page<ErpContractPaymentMethodVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<ErpContractPaymentMethodVo> queryList(ErpContractPaymentMethodBo bo) {
MPJLambdaWrapper<ErpContractPaymentMethod> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<ErpContractPaymentMethod> buildQueryWrapper(ErpContractPaymentMethodBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<ErpContractPaymentMethod> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -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<ErpContractPaymentStageVo> queryPageList(ErpContractPaymentStageBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<ErpContractPaymentStage> lqw = buildQueryWrapper(bo);
Page<ErpContractPaymentStageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<ErpContractPaymentStageVo> queryList(ErpContractPaymentStageBo bo) {
MPJLambdaWrapper<ErpContractPaymentStage> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<ErpContractPaymentStage> buildQueryWrapper(ErpContractPaymentStageBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<ErpContractPaymentStage> 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<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.oa.erp.mapper.ErpContractPaymentMethodMapper">
<resultMap type="org.dromara.oa.erp.domain.vo.ErpContractPaymentMethodVo" id="ErpContractPaymentMethodResult">
</resultMap>
<select id="selectCustomErpContractPaymentMethodVoList" resultMap="ErpContractPaymentMethodResult">
select payment_method_id, tenant_id, contract_id, sort_order, payment_stage_id, payment_deadline, payment_percentage, invoice_percentage, payment_amount, payment_description, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_payment_method t
${ew.getCustomSqlSegment}
</select>
</mapper>

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.oa.erp.mapper.ErpContractPaymentStageMapper">
<resultMap type="org.dromara.oa.erp.domain.vo.ErpContractPaymentStageVo" id="ErpContractPaymentStageResult">
</resultMap>
<select id="selectCustomErpContractPaymentStageVoList" resultMap="ErpContractPaymentStageResult">
select contract_stage_id,
tenant_id,
contract_id,
payment_stage_id,
stage_name,
collection_stage,
repayment_rate,
expect_repayment_date,
delay_day,
actual_repayment_date,
repayment_flag,
reasons_explanation,
schedule_remark,
repayment_amount,
sort_order,
remark,
del_flag,
create_dept,
create_by,
create_time,
update_by,
update_time
from erp_contract_payment_stage t
${ew.getCustomSqlSegment}
</select>
</mapper>
Loading…
Cancel
Save