From 9fe69906e40748cc597bc1cdcd0f1793b8ebf4bd Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 11 Oct 2024 14:23:06 +0800
Subject: [PATCH] 2024-10-11

---
 .../modules/test/vo/TestInformationVo.java    |   4 +
 .../mapper/test/TestInformationMapper.xml     | 117 ++++++++++--------
 2 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/src/main/java/com/spring/modules/test/vo/TestInformationVo.java b/src/main/java/com/spring/modules/test/vo/TestInformationVo.java
index cad3d01c..caff5535 100644
--- a/src/main/java/com/spring/modules/test/vo/TestInformationVo.java
+++ b/src/main/java/com/spring/modules/test/vo/TestInformationVo.java
@@ -68,4 +68,8 @@ public class TestInformationVo extends TestInformationEntity {
      * 驳回意见
      */
     private String rejectOpinion;
+
+    private String buNo;
+
+    private String buDesc;
 }
diff --git a/src/main/resources/mapper/test/TestInformationMapper.xml b/src/main/resources/mapper/test/TestInformationMapper.xml
index dc5e3b1d..df20006c 100644
--- a/src/main/resources/mapper/test/TestInformationMapper.xml
+++ b/src/main/resources/mapper/test/TestInformationMapper.xml
@@ -4,63 +4,69 @@
 
     <!-- 测试信息列表 -->
     <select id="testInformationSearch" parameterType="com.spring.modules.test.vo.TestInformationVo" resultType="com.spring.modules.test.vo.TestInformationVo">
-        SELECT
-            a.id,
-            a.site,
-            a.test_no,
-            a.project_id,
-            dbo.plm_get_project_name(a.site, a.project_id)     as projectName,
-            a.test_part_no,
-            dbo.plm_get_test_part_desc(a.site, a.test_part_no) as partName,
-            a.customer_no,
-            dbo.plm_get_customer_desc(a.site, a.customer_no)   as customerDesc,
-            a.tracker,
-            dbo.plm_get_user_display(a.site, a.tracker)        as trackerName,
-            a.engineer,
-            dbo.plm_get_user_display(a.site, a.engineer)       as engineerName,
-            a.artwork,
-            dbo.plm_get_user_display(a.site, a.artwork)        as artworkName,
-            a.planner,
-            dbo.plm_get_user_display(a.site, a.planner)        as plannerName,
-            a.priority_level,
-            a.test_number,
-            a.required_delivery_date,
-            a.remark,
-            a.technical_considerations,
-            a.is_need_to_send_samples,
-            a.send_samples_address,
-            a.consignee,
-            a.consignee_contact,
-            a.actuality_delivery_date,
-            a.test_result_information,
-            a.actuality_send_samples_date,
-            a.send_samples_method,
-            a.deliver_goods_information,
-            a.deliver_goods_remark,
-            a.actuality_reply_date,
-            a.confirm_results,
-            a.confirm_by,
-            a.confirm_information,
-            a.test_status,
-            a.test_result_status,
-            a.next_to_do,
-            a.create_date,
-            a.create_by,
-            a.update_date,
-            a.update_by,
-            a.print_type,
-            a.product_name,
-            a.step_id,
-            a.reject_flag,
-            a.reject_step_id,
-            d.is_reject,
-            d.node_id,
-            d.node_name
+        SELECT a.id,
+               a.site,
+               a.test_no,
+               a.project_id,
+               dbo.plm_get_project_name(a.site, a.project_id)     as projectName,
+               a.test_part_no,
+               dbo.plm_get_test_part_desc(a.site, a.test_part_no) as partName,
+               a.customer_no,
+               dbo.plm_get_customer_desc(a.site, a.customer_no)   as customerDesc,
+               a.tracker,
+               dbo.plm_get_user_display(a.site, a.tracker)        as trackerName,
+               a.engineer,
+               dbo.plm_get_user_display(a.site, a.engineer)       as engineerName,
+               a.artwork,
+               dbo.plm_get_user_display(a.site, a.artwork)        as artworkName,
+               a.planner,
+               dbo.plm_get_user_display(a.site, a.planner)        as plannerName,
+               a.priority_level,
+               a.test_number,
+               a.required_delivery_date,
+               a.remark,
+               a.technical_considerations,
+               a.is_need_to_send_samples,
+               a.send_samples_address,
+               a.consignee,
+               a.consignee_contact,
+               a.actuality_delivery_date,
+               a.test_result_information,
+               a.actuality_send_samples_date,
+               a.send_samples_method,
+               a.deliver_goods_information,
+               a.deliver_goods_remark,
+               a.actuality_reply_date,
+               a.confirm_results,
+               a.confirm_by,
+               a.confirm_information,
+               a.test_status,
+               a.test_result_status,
+               a.next_to_do,
+               a.create_date,
+               a.create_by,
+               a.update_date,
+               a.update_by,
+               a.print_type,
+               a.product_name,
+               a.step_id,
+               a.reject_flag,
+               a.reject_step_id,
+               d.is_reject,
+               d.node_id,
+               d.node_name,
+               vpp.bu_no,
+               b.bu_desc
         FROM plm_test_information as a
-        left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
-        left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
+                 left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
+                 left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and
+                                                    prh.workflow_id = d.workflow_id and a.step_id = d.step_id
+                 left join view_Project_Part vpp
+                           on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
+                 left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
         <where>
             a.site = #{query.site}
+              and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy}))
             <if test="query.testNo != null and query.testNo != ''">
                 AND a.test_no like #{query.testNo}
             </if>
@@ -103,6 +109,9 @@
             <if test="query.endDate != null">
                 AND #{query.endDate} >= a.required_delivery_date
             </if>
+            <if test="query.buNo != null and query.buNo != ''">
+                and b.bu_no = #{query.buNo}
+            </if>
         </where>
         order by a.test_no desc
     </select>