feat:银行流水关联多个合同，新增预收款开票，所有List校验调整为ColUtil

shiyunteng

4 小时以前 2db76f2066701cbe292f206ad49a7f8523b8aa9f

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

@@ -8,9 +8,13 @@
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.admin.api.vo.DeptExcelVO;
import com.by4cloud.platformx.business.dto.ProductAddDTO;
import com.by4cloud.platformx.business.dto.ProductQueryDTO;
import com.by4cloud.platformx.business.vo.ProductExcelVO;
import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.excel.annotation.RequestExcel;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.Product;
import com.by4cloud.platformx.business.service.ProductService;
@@ -23,6 +27,7 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
@@ -141,7 +146,7 @@
    @PostMapping
    @PreAuthorize("@pms.hasPermission('business_product_add')" )
    public R save(@RequestBody Product product) {
      if (ArrayUtil.isNotEmpty(productService.listByScope(Wrappers.lambdaQuery(product).eq(Product::getErpCode,product.getErpCode())).toArray())){
      if (CollUtil.isNotEmpty(productService.listByScope(Wrappers.lambdaQuery(product).eq(Product::getErpCode,product.getErpCode())))){
         return R.failed("产品Erp编码已存在");
      }
        return R.ok(productService.save(product));
@@ -186,4 +191,27 @@
    public List<Product> export(Product product,Long[] ids) {
        return productService.list(Wrappers.lambdaQuery(product).in(ArrayUtil.isNotEmpty(ids), Product::getId, ids));
    }

   /**
    * 新增产品信息
    * @param addDTOS 产品信息
    * @return R
    */
   @Operation(summary = "各公司新增产品信息" , description = "各公司新增产品信息" )
   @SysLog("各公司新增产品信息" )
   @PostMapping("/saveErpProduct")
   public R saveErpProduct(@RequestBody List<ProductAddDTO> addDTOS) {
      return productService.saveErpProduct(addDTOS);
   }

   /**
    * 导入部门
    * @param excelVOList
    * @param bindingResult
    * @return
    */
   @PostMapping("/importProduct")
   public R importProduct(@RequestExcel List<ProductExcelVO> excelVOList, BindingResult bindingResult) {
      return productService.importProduct(excelVOList, bindingResult);
   }
}