diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/LeaseOutInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/LeaseOutInfo.java
index 1ba85c9c..536a0da7 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/LeaseOutInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/LeaseOutInfo.java
@@ -90,4 +90,7 @@ public class LeaseOutInfo {
 
     @ApiModelProperty(value = "关键字")
     private String keyWord;
+
+    @ApiModelProperty(value = "任务类型")
+    private int taskType;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmReportMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmReportMapper.java
index 60c25cc2..fee58584 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmReportMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmReportMapper.java
@@ -80,4 +80,6 @@ public interface BmReportMapper {
      * @return
      */
     List<RepairInputDetails> getRepairInputDetailsList(RepairInputDto bean);
+
+    LeaseOutInfo getLeaseInfoById(Long parentId);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java
index 8055bc59..85f3b10c 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java
@@ -1,6 +1,7 @@
 package com.bonus.material.basic.service.impl;
 
 import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.material.basic.domain.report.*;
 import com.bonus.material.basic.mapper.BmReportMapper;
 import com.bonus.material.basic.service.BmReportService;
@@ -86,6 +87,12 @@ public class BmReportServiceImpl implements BmReportService {
                 totalLeaseNum = totalLeaseNum.add(leaseOutInfo.getLeaseNum());
                 totalOutNumNum = totalOutNumNum.add(leaseOutInfo.getOutNum());
                 totalPendingOutNum = totalPendingOutNum.add(leaseOutInfo.getPendingOutNum());
+                //判断是否是领用任务
+                if (StringUtils.isNotNull(leaseOutInfo)  && leaseOutInfo.getTaskType()==19){
+                    LeaseOutInfo leaseOutInfoNew = bmReportMapper.getLeaseInfoById(leaseOutInfo.getParentId());
+                    leaseOutInfo.setLeaseUnitName(leaseOutInfoNew.getLeaseUnitName());
+                    leaseOutInfo.setLeaseProjectName(leaseOutInfoNew.getLeaseProjectName());
+                }
             }
         }
         if (bean.getIsExport() == 0) {
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
index cf5cddc0..f4db4cd0 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
@@ -191,7 +191,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
         leaseApplyInfo.setUserId(userId == 0 ? null : userId);
         List<LeaseApplyInfo> list = mapper.selectLeaseApplyInfoList(leaseApplyInfo);
         if (!CollectionUtils.isEmpty(list)) {
-            for (LeaseApplyInfo applyInfo : list) {
+            /*for (LeaseApplyInfo applyInfo : list) {
                 // 根据任务id查询sys_workflow_record表，看任务是否已经开始，修改tm_task表状态为审核中
                 Integer status = mapper.selectStatusByTaskId(applyInfo.getTaskId());
                 if (status != null && status == 1) {
@@ -199,7 +199,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
                     applyInfo.setTaskStatusName(LeaseTaskStatusEnum.LEASE_AUDIT_ING.getStatusName());
                     mapper.updateLeaseTaskStatus(applyInfo.getTaskId(), LeaseTaskStatusEnum.LEASE_AUDIT_ING.getStatus());
                 }
-            }
+            }*/
             Integer taskStatus = leaseApplyInfo.getTaskStatus();
             String keyWord = leaseApplyInfo.getKeyWord();
             // 如果关键字不为空，进行过滤
@@ -401,15 +401,6 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
         log.info("用户id为{}",userId);
         List<LeaseApplyInfo> list = mapper.selectAuditLeaseApplyInfoList(leaseApplyInfo);
         try {
-            if (!CollectionUtils.isEmpty(list)) {
-                String keyWord = leaseApplyInfo.getKeyWord();
-                // 如果关键字不为空，进行过滤
-                if (!StringUtils.isBlank(keyWord)) {
-                    list = list.stream()
-                            .filter(item -> containsKeyword(item, keyWord))
-                            .collect(Collectors.toList());
-                }
-            }
             for (LeaseApplyInfo leaseApplyInfoNew : list) {
                 //获取当前节点，并根据当前节点获取审核人审核的角色信息
                 if (leaseApplyInfoNew.getNodeId()!=null){
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java
index 5b3657ce..52b499c0 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java
@@ -25,4 +25,6 @@ public interface DirectAuditMapper {
     List<DirectAudit> getAuditInfo(DirectAudit du);
 
     void updateWorkflowRecord(DirectAudit fr);
+
+    void updateDirectAudit(DirectApplyInfo directApplyInfo);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
index c066f2d7..1a7bdfc5 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
@@ -3,6 +3,7 @@ package com.bonus.material.work.service.impl;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.security.utils.SecurityUtils;
+import com.bonus.material.ma.domain.DirectApplyInfo;
 import com.bonus.material.settlement.service.ISltAgreementReduceService;
 import com.bonus.material.task.domain.TmTask;
 import com.bonus.material.task.mapper.TmTaskMapper;
@@ -45,9 +46,15 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
     @Resource
     private TmTaskMapper tmTaskMapper;
 
+    @Resource
+    private DirectAuditMapper directAuditMapper;
 
 
 
+
+    /**
+     * 审批
+     */
     @Override
     @Transactional
     public int updateSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory) {
@@ -124,6 +131,10 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
                                     break;
                                 // 工地直转16
                                 case 16:
+                                    DirectApplyInfo directApplyInfo = new DirectApplyInfo();
+                                    directApplyInfo.setId(sysWorkflowRecordHistory.getId());
+                                    directApplyInfo.setStatus("1");
+                                    directAuditMapper.updateDirectAudit(directApplyInfo);
                                     break;
                             }
                         }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml
index 3725c33c..9d575935 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml
@@ -98,7 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             lai.`code` as code,
             mt1.manage_type as manageType,
             lad.parent_id as parentId,
-            lad.type_id as typeId
+            lad.type_id as typeId,
+            tt.task_type as taskType
         FROM
             lease_apply_details lad
                 LEFT JOIN ma_type mt1 ON lad.type_id = mt1.type_id
@@ -106,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id
                 AND mt2.del_flag = '0'
                 LEFT JOIN lease_apply_info lai ON lad.parent_id = lai.id
+                LEFT JOIN tm_task tt ON tt.task_id = lai.task_id
                 LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
                 LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
                 LEFT JOIN bm_unit bu ON bai.unit_id = bu.unit_id
@@ -368,5 +370,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         GROUP BY mm.ma_id
     </select>
+    <select id="getLeaseInfoById" resultType="com.bonus.material.basic.domain.report.LeaseOutInfo">
+      select  bu.unit_name as leaseUnitName,
+            bp.pro_name as leaseProjectName
+        from  lease_apply_info lai
+            LEFT JOIN bm_unit bu ON lai.unit_id = bu.unit_id
+            LEFT JOIN bm_project bp ON lai.project_id = bp.pro_id
+        where  lai.id=#{parentId}
+    </select>
 
 </mapper>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
index de71797c..7b29080a 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
@@ -381,14 +381,13 @@
         lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id,
         lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party, lai.lease_sign_url,
         lai.lease_sign_type,tt.task_id as taskId,
-        lai.unit_id,lai.project_id,bu.unit_name, bp.pro_name, tt.task_status as taskStatus,
+        lai.unit_id,lai.project_id,bu.unit_name, bp.pro_name, swr.task_status as taskStatus,
 
-        case tt.task_status
+        case swr.task_status
         when 0 then '待审核'
-        when 1 then '已完成'
-        when 3 then '已完成'
-        when 4 then '已完成'
-        when 6 then '审核中'
+        when 1 then '审核中'
+        when 2 then '已完成'
+        when 3 then '已驳回'
         end as taskStatusName,
         IFNULL(sum(lad.pre_num),0) as preCountNum,
         IFNULL(sum(lad.al_num),0) as alNum,
@@ -411,6 +410,7 @@
         and sda.dict_type = 'lease_task_status'
         left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0'
         left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
+        left join sys_workflow_record swr on swr.task_id = lai.task_id
             where tt.task_type = '19'
             <if test="code != null  and code != ''">and lai.code = #{code}</if>
             <if test="taskId != null ">and lai.task_id = #{taskId}</if>
@@ -612,12 +612,7 @@
         <if test="keyWord != null  and keyWord != ''">
             and (bu.unit_name like concat('%', #{keyWord}, '%') or
             bp.pro_name like concat('%', #{keyWord}, '%') or
-            lai.code like concat('%', #{keyWord}, '%') or
-            lai.create_by like concat('%', #{keyWord}, '%') or
-            lai.lease_person like concat('%', #{keyWord}, '%') or
-            lai.phone like concat('%', #{keyWord}, '%') or
-            bp.contract_part like concat('%', #{keyWord}, '%') or
-            sd.dept_name like concat('%', #{keyWord}, '%')
+            mt1.type_name like concat('%', #{keyWord}, '%')
             )
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
index e1cb54b0..e7e3a35e 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
@@ -104,7 +104,7 @@
         bpl1.pro_id AS leaseProId,
         bpl1.pro_name AS leaseProName,
         GROUP_CONCAT(DISTINCT mt2.type_name) as typeName,
-        dai.*
+        swr.workflow_status as status
         FROM
         direct_apply_info dai
         LEFT JOIN bm_agreement_info bai ON dai.back_agreement_id = bai.agreement_id
@@ -117,6 +117,7 @@
         LEFT JOIN ma_type mt1 on mt1.type_id=dad.type_id
         LEFT JOIN ma_type mt2 on mt2.type_id=mt1.parent_id
         left join sys_user su on dai.create_by = su.user_id
+        left join sys_workflow_record swr on swr.task_id = dai.id
         <where>
             <if test="keyWord != null and keyWord != ''">
                 and (
@@ -246,4 +247,4 @@
         </if>
 
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml
index acf01161..7beb3966 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml
@@ -225,6 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      mt1.type_name   as typeName,
                      mt1.unit_name   as unitName,
                      bscd.num        as preNum,
+                     bscd.del_flag   as delFlag,
                      CASE mt1.manage_type
                          WHEN 0 THEN
                              IFNULL(subquery0.num, 0)
@@ -245,5 +246,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                     and mm.ma_status in (1)
                                   GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt1.type_id
               WHERE bscd.config_id = #{configId}) a
+        where a.storageNum !=0 and a.delFlag = '0'
     </select>
 </mapper>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml
index 42c05e82..2acced0b 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml
@@ -88,4 +88,7 @@
     <update id="updateWorkflowRecord">
         update sys_workflow_record set workflow_status = #{flowStatus} where id = #{id}
     </update>
+    <update id="updateDirectAudit">
+        update direct_apply_info set status = #{status} where id = #{id}
+    </update>
 </mapper>