1.0.63 add合同付款方式
yinq
2 months 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,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…
Reference in New Issue