2024-10-11

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;
 }

src/main/resources/mapper/test/TestInformationMapper.xml

@@ -4,8 +4,7 @@
 
     <!-- 测试信息列表 -->
     <select id="testInformationSearch" parameterType="com.spring.modules.test.vo.TestInformationVo" resultType="com.spring.modules.test.vo.TestInformationVo">
-        SELECT
-            a.id,
+        SELECT a.id,
                a.site,
                a.test_no,
                a.project_id,
@@ -55,12 +54,19 @@
                a.reject_step_id,
                d.is_reject,
                d.node_id,
-            d.node_name
+               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_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>