feat:合同新增时显示供应属性 出库新增根据合同出库 资金账目新增时间条件检索 新增延期出货菜单

shiyunteng

2026-06-17 0ee46d33cc339f3fd17593e6bfe2f033afe6019a

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java

@@ -1,11 +1,14 @@
package com.by4cloud.platformx.business.controller;

import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.dto.PaymentConfirmAddDTO;
import com.by4cloud.platformx.business.dto.PaymentConfirmQueryDTO;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.PaymentConfirm;
@@ -41,18 +44,21 @@
    /**
     * 分页查询
     * @param page 分页对象
     * @param paymentConfirm 收款确认
     * @param queryDTO 收款确认
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('business_paymentConfirm_view')" )
    public R getPaymentConfirmPage(@ParameterObject Page page, @ParameterObject PaymentConfirm paymentConfirm) {
    public R getPaymentConfirmPage(@ParameterObject Page page, @ParameterObject PaymentConfirmQueryDTO queryDTO) {
        LambdaQueryWrapper<PaymentConfirm> wrapper = Wrappers.lambdaQuery();
      wrapper.like(StrUtil.isNotBlank(paymentConfirm.getBusGuestName()),PaymentConfirm::getBusGuestName,paymentConfirm.getBusGuestName());
      wrapper.like(StrUtil.isNotBlank(paymentConfirm.getContractName()),PaymentConfirm::getContractName,paymentConfirm.getContractName());
      wrapper.like(StrUtil.isNotBlank(queryDTO.getBusGuestName()),PaymentConfirm::getBusGuestName,queryDTO.getBusGuestName());
      wrapper.like(StrUtil.isNotBlank(queryDTO.getContractName()),PaymentConfirm::getContractName,queryDTO.getContractName());
      wrapper.like(StrUtil.isNotBlank(queryDTO.getBusinessType()),PaymentConfirm::getBusinessType,queryDTO.getBusinessType());
      wrapper.ge(ObjUtil.isNotNull(queryDTO.getStartTime()),PaymentConfirm::getConfirmTime,queryDTO.getStartTime());
      wrapper.le(ObjUtil.isNotNull(queryDTO.getEndTime()),PaymentConfirm::getConfirmTime,queryDTO.getEndTime());
      wrapper.orderByDesc(PaymentConfirm::getCreateTime);
        return R.ok(paymentConfirmService.page(page, wrapper));
        return R.ok(paymentConfirmService.pageByScope(page, wrapper));
    }


@@ -70,15 +76,15 @@

    /**
     * 新增收款确认
     * @param paymentConfirm 收款确认
     * @param addDTO 收款确认
     * @return R
     */
    @Operation(summary = "新增收款确认" , description = "新增收款确认" )
    @SysLog("新增收款确认" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('business_paymentConfirm_add')" )
    public R save(@RequestBody PaymentConfirm paymentConfirm) {
        return R.ok(paymentConfirmService.save(paymentConfirm));
    public R save(@RequestBody PaymentConfirmAddDTO addDTO) {
        return paymentConfirmService.add(addDTO);
    }

    /**
@@ -120,4 +126,20 @@
    public List<PaymentConfirm> export(PaymentConfirm paymentConfirm,Long[] ids) {
        return paymentConfirmService.list(Wrappers.lambdaQuery(paymentConfirm).in(ArrayUtil.isNotEmpty(ids), PaymentConfirm::getId, ids));
    }

   /**
    * 定时查询收款单
    */
   @GetMapping("syncPaymentRecepit")
   public R syncPaymentRecepit(){
      return paymentConfirmService.syncPaymentRecepit();
   }

   /**
    * 业务类型
    */
   @GetMapping("queryAllBusinessType")
   public R queryAllBusinessType(){
      return paymentConfirmService.queryAllBusinessType();
   }
}