后端接口调整

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/ProductController.java

@@ -9,11 +9,14 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.ProductPageReqVO;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.ProductRespVO;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.ProductSaveReqVO;
+import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.SupplierRespVO;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.ProductDO;
+import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.service.product.ProductService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.commons.math3.stat.descriptive.summary.Product;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -91,4 +94,12 @@ public class ProductController {
                         BeanUtils.toBean(list, ProductRespVO.class));
     }
 
+    @GetMapping("all")
+    @Operation(summary = "获取所有供应商信息")
+    @PreAuthorize("@ss.hasPermission('supplier:base:all')")
+    public CommonResult<List<ProductRespVO>> getAll() {
+        List<ProductDO> all = productService.getAll();
+        List<ProductRespVO> bean = BeanUtils.toBean(all, ProductRespVO.class);
+        return success(bean);
+    }
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/SupplierController.java

@@ -96,6 +96,7 @@ public class SupplierController {
     @PreAuthorize("@ss.hasPermission('supplier:base:all')")
     public CommonResult<List<SupplierRespVO>> getAll() {
         List<SupplierDO> all = supplierService.getAll();
-        return success(BeanUtils.toBean(all, SupplierRespVO.class));
+        List<SupplierRespVO> bean = BeanUtils.toBean(all, SupplierRespVO.class);
+        return success(bean);
     }
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/ConnectRecordPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.supplier.controller.admin.product.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -18,6 +19,8 @@ public class ConnectRecordPageReqVO extends PageParam {
     @Schema(description = "供应商id", example = "14963")
     private Long supplierId;
 
+    @Schema(description = "供应商名称")
+    private String supplierName;
     @Schema(description = "我方联系人id", example = "13744")
     private Long userId;
 

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/ConnectRecordRespVO.java

@@ -19,6 +19,9 @@ public class ConnectRecordRespVO {
     @Schema(description = "供应商id", example = "14963")
     @ExcelProperty("供应商id")
     private Long supplierId;
+    @Schema(description = "供应商名称")
+    @ExcelProperty("供应商名称")
+    private String supplierName;
 
     @Schema(description = "我方联系人id", example = "13744")
     @ExcelProperty("我方联系人id")

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/ConnectRecordSaveReqVO.java

@@ -35,5 +35,6 @@ public class ConnectRecordSaveReqVO {
 
     @Schema(description = "附件")
     private String urls;
-
+    @Schema(description = "供应商名称")
+    private String supplierName;
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/ContactPageReqVO.java

@@ -21,6 +21,9 @@ public class ContactPageReqVO extends PageParam {
     @Schema(description = "姓名", example = "张三")
     private String name;
 
+    @Schema(description = "供应商名称")
+    private String supplierName;
+
     @Schema(description = "职务")
     private String position;
 

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/ContactRespVO.java

@@ -19,7 +19,9 @@ public class ContactRespVO {
     @Schema(description = "供应商id", example = "16668")
     @ExcelProperty("供应商id")
     private Long supplierId;
-
+    @Schema(description = "供应商名称")
+    @ExcelProperty("供应商名称")
+    private String supplierName;
     @Schema(description = "姓名", example = "张三")
     @ExcelProperty("姓名")
     private String name;
@@ -51,5 +53,4 @@ public class ContactRespVO {
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
-
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/ContactSaveReqVO.java

@@ -35,5 +35,7 @@ public class ContactSaveReqVO {
 
     @Schema(description = "备注", example = "随便")
     private String remark;
+    @Schema(description = "供应商名称")
+    private String supplierName;
 
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/CoreProductPageReqVO.java

@@ -17,6 +17,8 @@ public class CoreProductPageReqVO extends PageParam {
 
     @Schema(description = "供应商id", example = "21079")
     private Long supplierId;
+    @Schema(description = "供应商名称")
+    private String supplierName;
 
     @Schema(description = "产品id", example = "1462")
     private Long productId;

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/CoreProductRespVO.java

@@ -19,6 +19,8 @@ public class CoreProductRespVO {
     @Schema(description = "供应商id", example = "21079")
     @ExcelProperty("供应商id")
     private Long supplierId;
+    @Schema(description = "供应商名称")
+    private String supplierName;
 
     @Schema(description = "产品id", example = "1462")
     @ExcelProperty("产品id")

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/vo/CoreProductSaveReqVO.java

@@ -23,5 +23,6 @@ public class CoreProductSaveReqVO {
 
     @Schema(description = "优势介绍")
     private String advantage;
-
+    @Schema(description = "供应商名称")
+    private String supplierName;
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/dal/dataobject/product/ConnectRecordDO.java

@@ -31,6 +31,8 @@ public class ConnectRecordDO extends BaseDO {
      * 供应商id
      */
     private Long supplierId;
+
+    private String supplierName;
     /**
      * 我方联系人id
      */

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/dal/dataobject/product/ContactDO.java

@@ -31,6 +31,10 @@ public class ContactDO extends BaseDO {
      * 供应商id
      */
     private Long supplierId;
+    /**
+     * 供应商名称
+     */
+    private String supplierName;
     /**
      * 姓名
      */

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/dal/dataobject/product/CoreProductDO.java

@@ -31,6 +31,8 @@ public class CoreProductDO extends BaseDO {
      * 供应商id
      */
     private Long supplierId;
+
+    private String supplierName;
     /**
      * 产品id
      */

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/dal/mysql/product/ConnectRecordMapper.java

@@ -20,6 +20,7 @@ public interface ConnectRecordMapper extends BaseMapperX<ConnectRecordDO> {
     default PageResult<ConnectRecordDO> selectPage(ConnectRecordPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ConnectRecordDO>()
                 .eqIfPresent(ConnectRecordDO::getSupplierId, reqVO.getSupplierId())
+                .eqIfPresent(ConnectRecordDO::getSupplierName, reqVO.getSupplierName())
                 .eqIfPresent(ConnectRecordDO::getUserId, reqVO.getUserId())
                 .likeIfPresent(ConnectRecordDO::getUsername, reqVO.getUsername())
                 .eqIfPresent(ConnectRecordDO::getContactId, reqVO.getContactId())

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/dal/mysql/product/ContactMapper.java

@@ -27,6 +27,7 @@ public interface ContactMapper extends BaseMapperX<ContactDO> {
                 .eqIfPresent(ContactDO::getProductIds, reqVO.getProductIds())
                 .eqIfPresent(ContactDO::getProductNames, reqVO.getProductNames())
                 .eqIfPresent(ContactDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(ContactDO::getSupplierName, reqVO.getSupplierName())
                 .betweenIfPresent(ContactDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ContactDO::getId));
     }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/dal/mysql/product/CoreProductMapper.java

@@ -20,6 +20,7 @@ public interface CoreProductMapper extends BaseMapperX<CoreProductDO> {
     default PageResult<CoreProductDO> selectPage(CoreProductPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CoreProductDO>()
                 .eqIfPresent(CoreProductDO::getSupplierId, reqVO.getSupplierId())
+                .eqIfPresent(CoreProductDO::getSupplierName, reqVO.getSupplierName())
                 .eqIfPresent(CoreProductDO::getProductId, reqVO.getProductId())
                 .likeIfPresent(CoreProductDO::getProductName, reqVO.getProductName())
                 .eqIfPresent(CoreProductDO::getAdvantage, reqVO.getAdvantage())

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/service/product/ProductService.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.ProductSaveR
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.ProductDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 供应商产品 Service 接口
@@ -52,4 +53,5 @@ public interface ProductService {
      */
     PageResult<ProductDO> getProductPage(ProductPageReqVO pageReqVO);
 
+    List<ProductDO> getAll();
 }

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/service/product/ProductServiceImpl.java

@@ -8,13 +8,16 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.ProductPageReqVO;
 import cn.iocoder.yudao.module.supplier.controller.admin.product.vo.ProductSaveReqVO;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.ProductDO;
+import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.dal.mysql.product.ProductMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 import java.util.UUID;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -74,4 +77,8 @@ public class ProductServiceImpl implements ProductService {
         return productMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<ProductDO> getAll() {
+        return productMapper.selectList();
+    }
 }