From 22ffe59642422f6f2c68668069c93e148e2e2ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Wed, 1 Jan 2025 14:22:23 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=20?=
 =?UTF-8?q?=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=8A=B6=E6=80=81=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=A7=94?=
 =?UTF-8?q?=E5=A4=96=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85controller?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=BF=87=E6=BB=A4=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?0=E9=98=B6=E5=AD=90=E8=A1=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/controller/OutsourcePlanController.java  | 4 +++-
 .../templates/system/outsource_plan/outsource_plan.html       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java
index e9ab26af..af18ff69 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.OutsourcePlan;
@@ -61,7 +62,8 @@ public class OutsourcePlanController extends BaseController
     {
         OutsourcePlan outsourcePlan = outsourcePlanService.selectOutsourcePlanByOutsourcePlanId(outsourcePlanId);
         List<OutsourcePlanDetail> list = outsourcePlan.getOutsourcePlanDetailList();
-        return getDataTable(list);
+        List<OutsourcePlanDetail> filtList = list.stream().filter(item ->item.getLevel()== 0).collect(Collectors.toList());
+        return getDataTable(filtList);
     }
     /**
      * 导出委外计划列表
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
index 55ba42ff..56799893 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
@@ -24,7 +24,7 @@
                             </li>
                             <li>
                                 <label>状态：</label>
-                                <select name="status" th:with="type=${@dict.getType('purchase_plan_status')}">
+                                <select name="status" th:with="type=${@dict.getType('outsource_plan_status')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
@@ -64,7 +64,7 @@
         var processMethodDatas = [[${@dict.getType('processMethod')}]];
         var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
         var sourceTypeDatas = [[${@dict.getType('purchase_plan_source')}]];
-        var planStatusDatas = [[${@dict.getType('purchase_plan_status')}]];
+        var planStatusDatas = [[${@dict.getType('outsource_plan_status')}]];
 
         var prefix = ctx + "system/outsource_plan";