From 4ddb6185311ef557aea4eefac9dbf3e0653993cd Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 9 Oct 2024 17:36:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1009=E7=BA=A0=E9=94=99=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/Impl/TechnicalSpecificationServiceImpl.java       | 4 ++--
 .../resources/mapper/customer/ProjectInformationMapper.xml    | 2 +-
 .../resources/mapper/quotation/QuotationInformationMapper.xml | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
index 02b2da0a..098e1bd6 100644
--- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
+++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
@@ -195,8 +195,8 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         for (int i = 0; i <plmTechnicalSpecificationTeams.size() ; i++) {
             technicalSpecificationMapper.saveTechnicalSpecificationTeams(plmTechnicalSpecificationTeams.get(i));
         }
-        PlmProjectInfo plmProjectInfo=projectDao.getProjectData(inData.getSite(),inData.getProjectId());
-        inData.setBuNo(plmProjectInfo.getBuNo());
+        // PlmProjectInfo plmProjectInfo=projectDao.getProjectData(inData.getSite(),inData.getProjectId());
+        inData.setBuNo(checkPart.get(0).getBuNo());
         return inData;
 
     }
diff --git a/src/main/resources/mapper/customer/ProjectInformationMapper.xml b/src/main/resources/mapper/customer/ProjectInformationMapper.xml
index fe65cb3f..04394e54 100644
--- a/src/main/resources/mapper/customer/ProjectInformationMapper.xml
+++ b/src/main/resources/mapper/customer/ProjectInformationMapper.xml
@@ -31,7 +31,7 @@
             dbo.plm_get_customer_desc(site,customer_id) customerName,
             dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,
             dbo.get_projectUserRoleName(site,project_id) userRoleName,
-            bu_no,
+
             dbo.plm_get_bu_desc(site,bu_no) buDesc
         FROM plm_project_info
         WHERE site = #{site} and customer_id = #{customerId}
diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index aa7a2a2f..361dec61 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -242,7 +242,8 @@
                ppp.product_group_id2,
                dbo.get_product_group_name(ppp.site, ppp.product_group_id2, '2') as productGroupName2,
                ppp.um_id,
-                ppp.type
+                ppp.type,
+                ppp.bu_no
         FROM view_Project_Part as ppp
                  LEFT JOIN plm_project_info as ppi on ppp.site = ppi.site and ppp.project_id = ppi.project_id
         <where>

From cc282c0b5b6dcba1820f63e8469b177a43f0a7ed Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 9 Oct 2024 17:37:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1009=E7=BA=A0=E9=94=99=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/customer/ProjectInformationMapper.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/resources/mapper/customer/ProjectInformationMapper.xml b/src/main/resources/mapper/customer/ProjectInformationMapper.xml
index 04394e54..ebab36a3 100644
--- a/src/main/resources/mapper/customer/ProjectInformationMapper.xml
+++ b/src/main/resources/mapper/customer/ProjectInformationMapper.xml
@@ -31,8 +31,6 @@
             dbo.plm_get_customer_desc(site,customer_id) customerName,
             dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,
             dbo.get_projectUserRoleName(site,project_id) userRoleName,
-
-            dbo.plm_get_bu_desc(site,bu_no) buDesc
         FROM plm_project_info
         WHERE site = #{site} and customer_id = #{customerId}
     </select>

From 7eec0a474a288c6b3d4a71d9dfb99cd1fde17755 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 9 Oct 2024 17:37:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1009=E7=BA=A0=E9=94=99=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/customer/ProjectInformationMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/customer/ProjectInformationMapper.xml b/src/main/resources/mapper/customer/ProjectInformationMapper.xml
index ebab36a3..a081f071 100644
--- a/src/main/resources/mapper/customer/ProjectInformationMapper.xml
+++ b/src/main/resources/mapper/customer/ProjectInformationMapper.xml
@@ -30,7 +30,7 @@
             dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
             dbo.plm_get_customer_desc(site,customer_id) customerName,
             dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,
-            dbo.get_projectUserRoleName(site,project_id) userRoleName,
+            dbo.get_projectUserRoleName(site,project_id) userRoleName
         FROM plm_project_info
         WHERE site = #{site} and customer_id = #{customerId}
     </select>