From 751dda362561011138a0354aac4f8d708606583a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 13 Mar 2023 16:24:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/basic/UdiRlSupController.java   | 2 +-
 .../com/glxp/api/controller/purchase/SupCertController.java | 2 +-
 .../glxp/api/controller/purchase/SupProductController.java  | 3 +++
 .../java/com/glxp/api/entity/purchase/SupProductEntity.java | 6 ++++++
 .../com/glxp/api/req/purchase/SelectProductBindRequest.java | 1 +
 src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml     | 2 +-
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
index 6d4a3305..66552090 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
@@ -228,7 +228,7 @@ public class UdiRlSupController {
             return ResultVOUtils.error(500, vailResult);
         companyProductsRelService.insertCompanyProducts(udiInfoExportRequest);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
-        BeanUtils.copyProperties(udiProductEntity,udiInfoExportRequest.getSupplementRequest());
+        BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(),udiProductEntity);
         udiProductService.insertUdiInfo(udiProductEntity);
         return ResultVOUtils.success("后台正在导入，请稍后刷新查看！");
     }
diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
index aa92fd83..e3c5ceda 100644
--- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
@@ -128,7 +128,7 @@ public class SupCertController {
             supCertEntity.setCustomerId(customerId);
             supCertEntity.setType(postSelCertRequest.getCertType());
             supCertEntity.setCreateTime(new Date());
-            supCertEntity.setStatus(supCertSetEntity.isNeed()==true ? 0:1);
+            supCertEntity.setStatus(0);
             supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT);
             supCertEntity.setUpdateTime(new Date());
             boolean b = supCertService.insertCompanyCert(supCertEntity);
diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java
index 251d0be3..9b98f2ca 100644
--- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java
@@ -153,6 +153,8 @@ public class SupProductController {
 
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(Long.valueOf(selectProductBindRequest.getRelIdFk()));
 
+
+
         SupProductEntity supProductEntity = new SupProductEntity();
         BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
         supProductEntity.setProductId(selectProductBindRequest.getProductId());
@@ -168,6 +170,7 @@ public class SupProductController {
         supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
         supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
         supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
+        supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName());
         supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus());
 
         return ResultVOUtils.success(supProductEntity);
diff --git a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java
index 7668b7c1..dffec45b 100644
--- a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java
+++ b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java
@@ -254,4 +254,10 @@ public class SupProductEntity{
     @TableField("updateTime")
     private Date updateTime;
 
+    /**
+     * 往来单位ID
+     */
+    @TableField(exist = false)
+    private String companyName;
+
 }
diff --git a/src/main/java/com/glxp/api/req/purchase/SelectProductBindRequest.java b/src/main/java/com/glxp/api/req/purchase/SelectProductBindRequest.java
index e576550c..1abcae22 100644
--- a/src/main/java/com/glxp/api/req/purchase/SelectProductBindRequest.java
+++ b/src/main/java/com/glxp/api/req/purchase/SelectProductBindRequest.java
@@ -10,4 +10,5 @@ public class SelectProductBindRequest {
     private String manufacturerId;
     private String customerId;
     private Integer auditStatus;
+    private String companyName;
 }
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 52fbb7af..69a2a659 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -95,7 +95,7 @@
                basic_products.basicPrductRemak7,
                basic_products.basicPrductRemak8,
                basic_corp.name      companyName,
-               company_product_relevance.price
+               basic_products.price
         FROM company_product_relevance
                      inner JOIN basic_udirel
                 ON company_product_relevance.udiRlIdFk = basic_udirel.id