出库部分

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/controller/MydoJobDetailController.java

@@ -1,7 +1,10 @@
 package com.ruoyi.job.mydojobdetail.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.job.mydojobdetailfinish.service.IMydoJobDetailFinishService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +36,8 @@ public class MydoJobDetailController extends BaseController
 {
     @Autowired
     private IMydoJobDetailService mydoJobDetailService;
+    @Autowired
+    private IMydoJobDetailFinishService mydoJobDetailFinishService;
 
     /**
      * 查询子任务列表
@@ -42,7 +47,12 @@ public class MydoJobDetailController extends BaseController
     public TableDataInfo list(MydoJobDetail mydoJobDetail)
     {
         startPage();
-        List<MydoJobDetail> list = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetail);
+        List<MydoJobDetail> list = new ArrayList<>();
+        if(Integer.parseInt(mydoJobDetail.getStatus())<4) {
+            list = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetail);
+        }else{
+            list = mydoJobDetailFinishService.selectMydoJobDetailFinishListByJobDetail(mydoJobDetail);
+        }
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java

@@ -119,7 +119,17 @@ public class MydoJobDetail extends BaseEntity
     @Excel(name = "备用字段4")
     private String spare4;
 
-    public void setJobDetailId(String jobDetailId) 
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public void setJobDetailId(String jobDetailId)
     {
         this.jobDetailId = jobDetailId;
     }