diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
index 92ee36c9..63069d14 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
@@ -556,13 +556,25 @@ public class TmTaskController extends BaseController {
         return getDataTable(leaseAuditList);
     }
 
-    @Log(title = "获取领料申请-详情列表", businessType = BusinessType.QUERY)
+    @Log(title = "获取领料申请-查看列表", businessType = BusinessType.QUERY)
     @GetMapping("/getLeaseApplyListAll")
     public TableDataInfo getLeaseApplyListAll(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) {
         TmTask task = new TmTask();
         task.setTaskId(Long.parseLong(taskId));
+        task.setFlag(1);
         List<TmTask> leaseAuditList = tmTaskService.getLeaseApplyListAll(task);
         return getDataTable(leaseAuditList);
     }
 
+    @Log(title = "获取领料申请-驳回提交数据", businessType = BusinessType.QUERY)
+    @GetMapping("/getLeaseApplyAuditListAll")
+    public TableDataInfo getLeaseApplyAuditListAll(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) {
+        TmTask task = new TmTask();
+        task.setTaskId(Long.parseLong(taskId));
+        task.setFlag(0);
+        List<TmTask> leaseAuditList = tmTaskService.getLeaseApplyListAll(task);
+        return getDataTable(leaseAuditList);
+    }
+
+
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
index b4cbc809..eaf3d5c8 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
@@ -44,6 +44,8 @@ public class TmTask implements Serializable {
     @ApiModelProperty(value="任务状态(数据字典)")
     private Integer taskStatus;
 
+    private Integer flag;
+
     /**
     * 预领料合计数
     */
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 19cff259..fb8d014e 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -782,26 +782,46 @@ public class TmTaskServiceImpl implements TmTaskService {
         List<LeaseApplyInfo> leaseApplyInfos = new ArrayList<>();
         if (tmTask != null) {
             List<LeaseApplyInfo> leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task);
-            for (LeaseApplyInfo applyInfo : leaseApplyInfoList) {
-                if ("2".equals(applyInfo.getStatus()) || "4".equals(applyInfo.getStatus()) || "6".equals(applyInfo.getStatus()) || "8".equals(applyInfo.getStatus())) {
-                    leaseApplyInfos.add(applyInfo);
-                }
-            }
-            tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
-
-            List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
-            for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfos) {
-                if (leaseApplyInfo != null) {
-                    // 去查询领料任务详情表
-                    List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsByApply(leaseApplyInfo);
-                    if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
-                        leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
-                        listLeaseDetails.addAll(leaseApplyDetails);
+            if (task.getFlag() == 0) {
+                for (LeaseApplyInfo applyInfo : leaseApplyInfoList) {
+                    if ("2".equals(applyInfo.getStatus()) || "4".equals(applyInfo.getStatus()) || "6".equals(applyInfo.getStatus()) || "8".equals(applyInfo.getStatus())) {
+                        leaseApplyInfos.add(applyInfo);
                     }
                 }
+                tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
+
+                List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
+                for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfos) {
+                    if (leaseApplyInfo != null) {
+                        // 去查询领料任务详情表
+                        List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsByApply(leaseApplyInfo);
+                        if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
+                            leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
+                            listLeaseDetails.addAll(leaseApplyDetails);
+                        }
+                    }
+                }
+                // 塞入领料任务详情的集合中
+                tmTask.setLeaseApplyDetails(listLeaseDetails);
+            }
+
+            if (task.getFlag() == 1) {
+                tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
+
+                List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
+                for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
+                    if (leaseApplyInfo != null) {
+                        // 去查询领料任务详情表
+                        List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsByApply(leaseApplyInfo);
+                        if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
+                            leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
+                            listLeaseDetails.addAll(leaseApplyDetails);
+                        }
+                    }
+                }
+                // 塞入领料任务详情的集合中
+                tmTask.setLeaseApplyDetails(listLeaseDetails);
             }
-            // 塞入领料任务详情的集合中
-            tmTask.setLeaseApplyDetails(listLeaseDetails);
         }
         tmTaskList.add(tmTask);
         return tmTaskList;