From cc8e61afdacd853601a44ccb8998f57ee6155b7d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 21 Oct 2026 11:20:00 +0800
Subject: [PATCH] =?UTF-8?q?2026-10-21=20=E9=94=80=E5=94=AE=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E5=A2=9E=E5=8A=A0=E2=80=9C=E9=94=80=E5=94=AE=E2=80=9D?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=9B=20=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E5=8F=82=E6=95=B0=E5=8D=A1=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=94=B9=E4=B8=BA=EF=BC=9A?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E9=A2=97=E6=96=99=E5=8F=B7=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=8D=95=E9=83=BD=E6=98=BE=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChangeManagementServiceImpl.java     |  2 +-
 .../resources/mapper/quote/QuoteMapper.xml    |  8 +++
 .../TechnicalSpecificationMapper.xml          | 49 +++++++++++++++----
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index 0b09653b..9363a610 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -1971,7 +1971,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
             // 9、统一待办接口
             for (String key : dcas.keySet()) {
                 String oaUserId = dcas.get(key).split("#")[1];
-                // 创建单点登录地址
+                // 创建登录地址
                 String url = loginTokenUrl + "?dca=" + key + "&token=" + dcas.get(key).split("#")[0] + "&site=" + paramData.getSite() + "&path=" + paramData.getPath() + "&docNo=" + paramData.getDocNo();
                 ReceiveRequestInfoParam receiveRequestInfoParam = new ReceiveRequestInfoParam(
                         paramData.getUserId(),
diff --git a/src/main/resources/mapper/quote/QuoteMapper.xml b/src/main/resources/mapper/quote/QuoteMapper.xml
index 53aa9815..02cfd93d 100644
--- a/src/main/resources/mapper/quote/QuoteMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteMapper.xml
@@ -212,6 +212,9 @@
         <if test="params.approvalUsername != null and params.approvalUsername != ''">
             AND dbo.get_plm_Approval_username(q.site, prh.workflow_id, prn.node_id, q.quote_version_no) like #{params.approvalUsername}
         </if>
+        <if test="params.inquiryCreateBy != null and params.inquiryCreateBy != ''">
+            and (qq.create_by like #{params.inquiryCreateBy} or su_inquiry.user_display like #{params.inquiryCreateBy})
+        </if>
     </sql>
 
     <!-- 报价单分页-总数（直接 COUNT，不经过 PaginationInterceptor） -->
@@ -228,6 +231,10 @@
                  left join plm_request_node prn on q.site = prn.site and prh.classification_no = prn.classification_no
                      and prh.workflow_id = prn.workflow_id and q.step_id = prn.step_id
         </if>
+        <if test="params.inquiryCreateBy != null and params.inquiryCreateBy != ''">
+                 left join plm_quotation_information qq on q.site = qq.site and q.inside_inquiry_no = qq.quotation_no
+                 left join sys_user su_inquiry on qq.create_by = su_inquiry.username
+        </if>
         <where>
             <include refid="quotePageWhereConditions"/>
         </where>
@@ -300,6 +307,7 @@
                      and sdd_final.dict_value = p.final_customer_id and sdd_final.site = q.site
         left join plm_request_header prh on q.site = prh.site and prh.menu_id = '5011'
         left join plm_quotation_information qq on q.site = qq.site and q.inside_inquiry_no = qq.quotation_no
+        left join sys_user su_inquiry on qq.create_by = su_inquiry.username
         left join plm_request_node prn on q.site = prn.site and prh.classification_no = prn.classification_no
                      and prh.workflow_id = prn.workflow_id and q.step_id = prn.step_id
         outer apply (
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 27b4bdb7..58ab098e 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -2727,14 +2727,34 @@
     </select>
 
     <select id="queryChangeLog" resultType="com.spring.modules.change.vo.ChangeRequestVo">
-        WITH SpecCode AS (SELECT ori_code_no
-                          FROM plm_technical_specification_sheet
-                          WHERE site = #{site}
-                            AND code_no = #{codeNo}),
-             TargetCode AS (SELECT code_no
-                            FROM plm_technical_specification_sheet
-                            WHERE ori_code_no IN (SELECT ori_code_no FROM SpecCode))
-        SELECT a.site,
+        WITH CurrentSpec AS (
+            SELECT a.site,
+                   a.code_no,
+                   a.test_part_no
+            FROM plm_technical_specification_sheet a
+            WHERE a.site = #{site}
+              AND a.code_no = #{codeNo}
+        ),
+        PartKeys AS (
+            SELECT test_part_no AS part_key
+            FROM CurrentSpec
+            WHERE test_part_no IS NOT NULL
+              AND LTRIM(RTRIM(test_part_no)) <![CDATA[<>]]> ''
+        ),
+        TargetCode AS (
+            SELECT s.code_no
+            FROM plm_technical_specification_sheet s
+            INNER JOIN CurrentSpec c ON s.site = c.site
+            WHERE (
+                      EXISTS (SELECT 1 FROM PartKeys)
+                      AND s.test_part_no IN (SELECT part_key FROM PartKeys)
+                  )
+               OR (
+                      NOT EXISTS (SELECT 1 FROM PartKeys)
+                      AND s.code_no = c.code_no
+                  )
+        )
+        SELECT DISTINCT a.site,
                a.bu_no,
                a.change_no,
                a.applicant_id,
@@ -2776,11 +2796,20 @@
         FROM plm_change_request a
                  LEFT JOIN sys_user b
                            ON a.site = b.site AND a.applicant_id = b.username
-                 LEFT JOIN plm_change_request_detail pcrd
+                 INNER JOIN plm_change_request_detail pcrd
                            ON a.site = pcrd.site AND a.change_no = pcrd.change_no
         WHERE a.site = #{site}
           AND a.show_in_query_flag = 'Y'
-          AND pcrd.code_no IN (SELECT code_no FROM TargetCode)
+          AND (
+                pcrd.code_no IN (SELECT code_no FROM TargetCode)
+                OR EXISTS (
+                    SELECT 1
+                    FROM PartKeys k
+                    WHERE k.part_key = pcrd.part_no
+                       OR k.part_key = pcrd.new_part_no
+                )
+              )
+        ORDER BY a.apply_date DESC, a.change_no DESC
     </select>
 
     <!--    <select id="queryChangeLog" resultType="com.spring.modules.change.vo.ChangeRequestVo">-->