diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java
index fdf2baab..3b1eb622 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java
@@ -178,4 +178,7 @@ public class RepairInputDetails extends BaseEntity {
     @ApiModelProperty(value = "详情列表")
     private List<RepairInputDetails> detailsList;
 
+    @ApiModelProperty(value = "app维修任务状态，1 进行中 1已审核（包含通过和驳回）")
+    private Integer appTaskStatus;
+
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
index 533e9ca6..a4f8960f 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
@@ -5,6 +5,9 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
+import cn.hutool.core.convert.Convert;
+import com.bonus.common.biz.config.ListPagingUtil;
+import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.back.domain.BackApplyDetails;
 import com.bonus.material.back.domain.MaCode;
@@ -43,11 +46,12 @@ public class BackApplyInfoController extends BaseController {
     @ApiOperation(value = "查询退料任务列表")
 //    @RequiresPermissions("back:info:list")
     @GetMapping("/list")
-    public TableDataInfo list(BackApplyInfo backApplyInfo) {
+    public AjaxResult list(BackApplyInfo backApplyInfo) {
         backApplyInfo.setIsExport(false);
-        startPage();
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<BackApplyInfo> list = backApplyInfoService.selectBackApplyInfoList(backApplyInfo);
-        return getDataTable(list);
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**
@@ -258,7 +262,7 @@ public class BackApplyInfoController extends BaseController {
      */
     @ApiOperation(value = "app编码查看保存")
     @PreventRepeatSubmit
-    @RequiresPermissions("back:info:edit")
+    //@RequiresPermissions("back:info:edit")
     @SysLog(title = "退料任务", businessType = OperaType.UPDATE, logType =  1,module = "仓储管理->删除退料任务")
 	@PostMapping("/updateMaCode")
     public AjaxResult updateMaCode(@RequestBody MaCode maCode) {
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java
index e4455998..307fa2f4 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java
@@ -169,4 +169,7 @@ public class BackApplyInfo implements Serializable {
 
     @ApiModelProperty(value = "审批人人签名URL")
     private String directAuditSignUrl;
+
+    @ApiModelProperty(value = "app退料任务状态，0 未审核 1已审核（包含通过和驳回）")
+    private Integer appTaskStatus;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
index 6dfae5a0..d24f8559 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
@@ -213,6 +213,14 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
         if (CollectionUtils.isEmpty(list)) {
             return new ArrayList<>();
         }
+        // 提取关键字
+        String keyWord = backApplyInfo.getKeyWord();
+        // 如果关键字不为空，进行过滤
+        if (!StringUtils.isBlank(keyWord)) {
+            list = list.stream()
+                    .filter(item -> containsKeyword(item, keyWord))
+                    .collect(Collectors.toList());
+        }
         // 如果需要导出
         if (backApplyInfo.getIsExport()) {
             for (BackApplyInfo applyInfo : list) {
@@ -235,6 +243,19 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
         return list;
     }
 
+    /**
+     * 关键字搜索
+     * @param item
+     * @param keyWord
+     * @return
+     */
+    private boolean containsKeyword(BackApplyInfo item, String keyWord) {
+        return (item.getTypeName() != null && item.getTypeName().contains(keyWord)) ||
+                (item.getCode() != null && item.getCode().contains(keyWord)) ||
+                (item.getBackPerson() != null && item.getBackPerson().contains(keyWord)) ||
+                (item.getPhone() != null && item.getPhone().contains(keyWord));
+    }
+
     /**
      * 更新电子签名
      *
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java
index c031c4ee..5303cb81 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java
@@ -1,11 +1,13 @@
 package com.bonus.material.lease.controller;
 
+import cn.hutool.core.convert.Convert;
 import com.bonus.common.biz.annotation.StoreLog;
+import com.bonus.common.biz.config.ListPagingUtil;
 import com.bonus.common.biz.domain.lease.LeaseOutDetails;
+import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
-import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.common.log.annotation.SysLog;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.basic.domain.BmQrcodeInfo;
@@ -43,10 +45,11 @@ public class LeaseApplyInfoController extends BaseController {
     @ApiOperation(value = "查询领料任务列表")
     //@RequiresPermissions("lease:info:list")
     @GetMapping("/list")
-    public TableDataInfo list(LeaseApplyInfo leaseApplyInfo) {
-        startPage();
+    public AjaxResult list(LeaseApplyInfo leaseApplyInfo) {
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<LeaseApplyInfo> list = leaseApplyInfoService.selectLeaseApplyInfoList(leaseApplyInfo);
-        return getDataTable(list);
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index 6da8c6a5..e803a883 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -15,10 +15,10 @@ import com.bonus.common.biz.enums.MaMachineStatusEnum;
 import com.bonus.common.biz.enums.TmTaskTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.back.domain.vo.MaCodeVo;
-import com.bonus.material.basic.domain.BmQrBoxInfo;
 import com.bonus.material.basic.domain.BmQrcodeInfo;
 import com.bonus.material.lease.domain.LeaseApplyDetails;
 import com.bonus.common.biz.domain.lease.LeaseOutDetails;
@@ -123,7 +123,35 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
     @Override
     public List<LeaseApplyInfo> selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo) {
         leaseApplyInfo.setUserId(SecurityUtils.getUserId());
-        return leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo);
+        List<LeaseApplyInfo> list = leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo);
+        if (!CollectionUtils.isEmpty(list)) {
+            String keyWord = leaseApplyInfo.getKeyWord();
+            // 如果关键字不为空，进行过滤
+            if (!StringUtils.isBlank(keyWord)) {
+                list = list.stream()
+                        .filter(item -> containsKeyword(item, keyWord))
+                        .collect(Collectors.toList());
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 关键字搜索
+     * @param item
+     * @param keyWord
+     * @return
+     */
+    private boolean containsKeyword(LeaseApplyInfo item, String keyWord) {
+        return (item.getMaTypeNames() != null && item.getMaTypeNames().contains(keyWord)) ||
+                (item.getUnitName() != null && item.getUnitName().contains(keyWord)) ||
+                (item.getProjectName() != null && item.getProjectName().contains(keyWord)) ||
+                (item.getCode() != null && item.getCode().contains(keyWord)) ||
+                (item.getCreateBy() != null && item.getCreateBy().contains(keyWord)) ||
+                (item.getLeasePerson() != null && item.getLeasePerson().contains(keyWord)) ||
+                (item.getLeasePhone() != null && item.getLeasePhone().contains(keyWord)) ||
+                (item.getContractPart() != null && item.getContractPart().contains(keyWord)) ||
+                (item.getImpUnitName() != null && item.getImpUnitName().contains(keyWord));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/PartLeaseController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/PartLeaseController.java
index 25c619dd..9a45e2d8 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/PartLeaseController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/PartLeaseController.java
@@ -1,10 +1,11 @@
 package com.bonus.material.part.controller;
 
+import cn.hutool.core.convert.Convert;
+import com.bonus.common.biz.config.ListPagingUtil;
+import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
-import com.bonus.common.core.web.page.TableDataInfo;
-import com.bonus.material.basic.domain.RetainedEquipmentInfo;
 import com.bonus.material.ma.domain.PartType;
 import com.bonus.material.part.domain.PartLeaseDetails;
 import com.bonus.material.part.domain.PartLeaseInfo;
@@ -57,10 +58,11 @@ public class PartLeaseController extends BaseController {
 
     @ApiOperation(value = "查询配件领料任务列表")
     @GetMapping("/selectPartLeaseInfoList")
-    public TableDataInfo selectPartLeaseInfoList(PartLeaseInfo partLeaseInfo) {
-        startPage();
-        final List<PartLeaseInfo> partLeaseInfos = partLeaseService.selectPartLeaseInfoList(partLeaseInfo);
-        return getDataTable(partLeaseInfos);
+    public AjaxResult selectPartLeaseInfoList(PartLeaseInfo partLeaseInfo) {
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
+        List<PartLeaseInfo> list = partLeaseService.selectPartLeaseInfoList(partLeaseInfo);
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseDetails.java
index 1217ddee..4ca89faa 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseDetails.java
@@ -53,4 +53,6 @@ public class PartLeaseDetails extends BaseEntity implements java.io.Serializable
     @ApiModelProperty(value = "发料单位")
     private String sendDeptName;
 
+    private String keyWord;
+
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartLeaseServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartLeaseServiceImpl.java
index 38f027f6..38d3e1c6 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartLeaseServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartLeaseServiceImpl.java
@@ -1,11 +1,12 @@
 package com.bonus.material.part.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.biz.enums.PartLeaseTaskStatusEnum;
-import com.bonus.common.biz.enums.TmTaskTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.ma.domain.PartType;
@@ -44,7 +45,30 @@ public class PartLeaseServiceImpl implements PartLeaseService {
      */
     @Override
     public List<PartLeaseInfo> selectPartLeaseInfoList(PartLeaseInfo partLeaseInfo) {
-        return partLeaseMapper.selectPartLeaseInfoList(partLeaseInfo);
+        List<PartLeaseInfo> list = partLeaseMapper.selectPartLeaseInfoList(partLeaseInfo);
+        if (CollectionUtil.isNotEmpty(list)) {
+            String keyWord = partLeaseInfo.getKeyWord();
+            // 如果关键字不为空，进行过滤
+            if (!StringUtils.isBlank(keyWord)) {
+                list = list.stream()
+                        .filter(item -> containsKeyword(item, keyWord))
+                        .collect(Collectors.toList());
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 关键字搜索
+     * @param item
+     * @param keyWord
+     * @return
+     */
+    private boolean containsKeyword(PartLeaseInfo item, String keyWord) {
+        return (item.getPartName() != null && item.getPartName().contains(keyWord)) ||
+                (item.getCode() != null && item.getCode().contains(keyWord)) ||
+                (item.getCreator() != null && item.getCreator().contains(keyWord)) ||
+                (item.getAuditor() != null && item.getAuditor().contains(keyWord));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
index 03f9cf6e..aeb98292 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
@@ -14,8 +14,8 @@ import com.bonus.common.biz.enums.PurchaseTaskStatusEnum;
 import com.bonus.common.biz.enums.TmTaskTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
-import com.bonus.common.core.web.domain.BaseEntity;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.basic.domain.BmFileInfo;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
@@ -34,7 +34,6 @@ import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo;
 import com.bonus.material.purchase.mapper.PurchaseMacodeInfoMapper;
 import com.bonus.material.task.domain.TmTask;
 import com.bonus.material.task.mapper.TmTaskMapper;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -195,7 +194,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
         final AtomicReference<Long> loginUserId = new AtomicReference<>(SecurityUtils.getUserId());
         if (Objects.isNull(loginUserId.get()) || Objects.isNull(purchaseQueryDto.getTaskStage())) {return Collections.emptyList();}
 
-        final List<PurchaseCheckInfo> purchaseCheckInfoResult = new ArrayList<>();
+        List<PurchaseCheckInfo> purchaseCheckInfoResult = new ArrayList<>();
         final boolean isAllowPartTransfer = bmConfigService.isBmConfigEnabledWithDefaultFalse(BmConfigItems.BOOLEAN_ALLOW_PURCHASE_PART_TRANSFER);
 
         for (final PurchaseCheckInfo purchaseInfo : purchaseCheckInfos) {
@@ -300,9 +299,31 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
 
             }
         }
+        if (!CollectionUtils.isEmpty(purchaseCheckInfoResult)) {
+            String keyWord = purchaseQueryDto.getKeyWord();
+            // 如果关键字不为空，进行过滤
+            if (!StringUtils.isBlank(keyWord)) {
+                purchaseCheckInfoResult = purchaseCheckInfoResult.stream()
+                        .filter(item -> containsKeyword(item, keyWord))
+                        .collect(Collectors.toList());
+            }
+        }
         return purchaseCheckInfoResult;
     }
 
+    /**
+     * 关键字搜索
+     * @param item
+     * @param keyWord
+     * @return
+     */
+    private boolean containsKeyword(PurchaseCheckInfo item, String keyWord) {
+        return (item.getPurchaseMaTypeName() != null && item.getPurchaseMaTypeName().contains(keyWord)) ||
+                (item.getCode() != null && item.getCode().contains(keyWord)) ||
+                (item.getSupplier() != null && item.getSupplier().contains(keyWord)) ||
+                (item.getCreateBy() != null && item.getCreateBy().contains(keyWord));
+    }
+
     /**
      * 查询新购验收任务详细列表
      *
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
index 05eab9d7..13170472 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
@@ -6,19 +6,20 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
 
+import cn.hutool.core.convert.Convert;
 import com.bonus.common.biz.annotation.StoreLog;
+import com.bonus.common.biz.config.ListPagingUtil;
+import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import com.bonus.material.repair.domain.RepairPart;
 import com.bonus.material.repair.domain.RepairRecord;
-import com.bonus.material.repair.domain.vo.RepairAuditDetailsVO;
 import com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO;
 import com.bonus.material.repair.domain.vo.ScrapAudit;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -56,11 +57,11 @@ public class RepairAuditDetailsController extends BaseController {
     @GetMapping("/questList")
     @SysLog(title = "查询修试审核任务列表", businessType = OperaType.QUERY, module = "机具系统->查询修试审核任务列表")
     @RequiresPermissions("service:auditing:list")
-    public TableDataInfo questList(RepairAuditDetails repairAuditDetails) {
-        startPage();
-        repairAuditDetailsService.queryTimeCope(repairAuditDetails);
+    public AjaxResult questList(RepairAuditDetails repairAuditDetails) {
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<ScrapApplyDetailsVO> list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails);
-        return getDataTable(list);
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java
index d0344739..93a54c77 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java
@@ -1,6 +1,9 @@
 package com.bonus.material.repair.controller;
 
+import cn.hutool.core.convert.Convert;
+import com.bonus.common.biz.config.ListPagingUtil;
 import com.bonus.common.core.exception.ServiceException;
+import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
@@ -50,10 +53,11 @@ public class RepairController extends BaseController {
     @ApiOperation(value = "获取维修任务列表--分页")
     @GetMapping("/getRepairTaskList")
     //@RequiresPermissions(value = "repair:manage:list")
-    public TableDataInfo getRepairTaskList(RepairTask bean) {
-        startPage();
+    public AjaxResult getRepairTaskList(RepairTask bean) {
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<RepairTask> list = service.getRepairTaskList(bean);
-        return getDataTable(list);
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java
index 80c7f34d..1ba1f1e2 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java
@@ -3,7 +3,10 @@ package com.bonus.material.repair.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.convert.Convert;
 import com.bonus.common.biz.annotation.StoreLog;
+import com.bonus.common.biz.config.ListPagingUtil;
+import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.back.domain.vo.MaCodeVo;
 import com.bonus.material.basic.domain.BmQrcodeInfo;
@@ -26,7 +29,6 @@ import com.bonus.material.repair.service.IRepairInputDetailsService;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.utils.poi.ExcelUtil;
-import com.bonus.common.core.web.page.TableDataInfo;
 
 /**
  * 修试后入库Controller
@@ -47,10 +49,11 @@ public class RepairInputDetailsController extends BaseController {
     @ApiOperation(value = "查询修试后入库列表")
     //@RequiresPermissions("repair:details:list")
     @GetMapping("/list")
-    public TableDataInfo list(RepairInputDetails repairInputDetails) {
-        startPage();
+    public AjaxResult list(RepairInputDetails repairInputDetails) {
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<RepairInputDetails> list = repairInputDetailsService.selectRepairInputDetailsList(repairInputDetails);
-        return getDataTable(list);
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java
index 7f50cc2a..17a5a40c 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java
@@ -128,4 +128,13 @@ public class RepairAuditDetails extends BaseEntity {
 
     @ApiModelProperty(value = "管理模式")
     private String manageType;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "app维修审核状态，10 进行中 11已审核（包含通过和驳回）")
+    private Integer appTaskStatus;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java
index 542128fd..76cdca29 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java
@@ -83,7 +83,7 @@ public class RepairTask {
     /**
      * 关键字
      */
-    private String keyword;
+    private String keyWord;
     /**
      * 开始时间
      */
@@ -163,4 +163,7 @@ public class RepairTask {
 
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "app维修任务状态，0 进行中 1已审核（包含通过和驳回）")
+    private Integer appTaskStatus;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
index 96e5a775..3cd008b2 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
@@ -138,6 +138,15 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     }
                 }
             }
+            if (CollectionUtil.isNotEmpty(repairQuestList)) {
+                String keyWord = repairAuditDetails.getKeyword();
+                // 如果关键字不为空，进行过滤
+                if (!StringUtils.isBlank(keyWord)) {
+                    repairQuestList = repairQuestList.stream()
+                            .filter(item -> containsKeyword(item, keyWord))
+                            .collect(Collectors.toList());
+                }
+            }
             return repairQuestList;
         } catch (Exception e) {
             // 异常处理
@@ -146,6 +155,21 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
         }
     }
 
+    /**
+     * 关键字搜索
+     * @param item
+     * @param keyWord
+     * @return
+     */
+    private boolean containsKeyword(ScrapApplyDetailsVO item, String keyWord) {
+        return (item.getItemType() != null && item.getItemType().contains(keyWord)) ||
+                (item.getRepairTaskCode() != null && item.getRepairTaskCode().contains(keyWord)) ||
+                (item.getRepairNum() != null && item.getRepairNum().contains(keyWord)) ||
+                (item.getUnitName() != null && item.getUnitName().contains(keyWord)) ||
+                (item.getProjectName() != null && item.getProjectName().contains(keyWord)) ||
+                (item.getCreateBy() != null && item.getCreateBy().contains(keyWord));
+    }
+
     /**
      * 修饰审核任务审核
      *
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
index cb80de5e..6d1fb701 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
@@ -22,6 +22,7 @@ import com.bonus.material.basic.domain.BmQrcodeInfo;
 import com.bonus.material.lease.mapper.LeaseOutDetailsMapper;
 import com.bonus.material.ma.domain.Type;
 import com.bonus.material.repair.domain.RepairInputInfo;
+import com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO;
 import com.bonus.material.task.domain.TmTask;
 import com.bonus.material.task.domain.TmTaskAgreement;
 import com.bonus.material.task.mapper.TmTaskAgreementMapper;
@@ -120,10 +121,32 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
                     inputDetails.setPendingInputNum(totalPendingInputNum);
                 }
             }
+            String keyWord = repairInputDetails.getKeyWord();
+            // 如果关键字不为空，进行过滤
+            if (!StringUtils.isBlank(keyWord)) {
+                list = list.stream()
+                        .filter(item -> containsKeyword(item, keyWord))
+                        .collect(Collectors.toList());
+            }
         }
         return list;
     }
 
+    /**
+     * 关键字搜索
+     * @param item
+     * @param keyWord
+     * @return
+     */
+    private boolean containsKeyword(RepairInputDetails item, String keyWord) {
+        return (item.getMaterialType() != null && item.getMaterialType().contains(keyWord)) ||
+                (item.getRepairCode() != null && item.getRepairCode().contains(keyWord)) ||
+                (item.getInputCode() != null && item.getInputCode().contains(keyWord)) ||
+                (item.getBackUnit() != null && item.getBackUnit().contains(keyWord)) ||
+                (item.getBackPro() != null && item.getBackPro().contains(keyWord)) ||
+                (item.getCreateBy() != null && item.getCreateBy().contains(keyWord));
+    }
+
     /**
      * 新增修试后入库
      * 
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
index 7bbb5743..e9b8af42 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
@@ -5,9 +5,9 @@ import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.biz.enums.*;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
-import com.bonus.material.back.domain.BackApplyDetails;
 import com.bonus.material.back.domain.BackApplyInfo;
 import com.bonus.material.back.mapper.BackApplyInfoMapper;
 import com.bonus.material.basic.domain.BmFileInfo;
@@ -73,9 +73,39 @@ public class RepairServiceImpl implements RepairService {
     private final int RETURN_FACTORY = 2; // 需要严格匹配枚举值  RepairTypeEnum.RETURN_FACTORY.getTypeId();
     private final int TO_SCRAP = 3; // 需要严格匹配枚举值  RepairTypeEnum.TO_SCRAP.getTypeId();
 
+    /**
+     * 维修任务一级列表
+     * @param bean
+     * @return
+     */
     @Override
     public List<RepairTask> getRepairTaskList(RepairTask bean) {
-        return repairMapper.getRepairTaskList(bean);
+        List<RepairTask> list = repairMapper.getRepairTaskList(bean);
+        if (CollectionUtil.isNotEmpty(list)) {
+            String keyWord = bean.getKeyWord();
+            // 如果关键字不为空，进行过滤
+            if (!StringUtils.isBlank(keyWord)) {
+                list = list.stream()
+                        .filter(item -> containsKeyword(item, keyWord))
+                        .collect(Collectors.toList());
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 关键字搜索
+     * @param item
+     * @param keyWord
+     * @return
+     */
+    private boolean containsKeyword(RepairTask item, String keyWord) {
+        return (item.getType() != null && item.getType().contains(keyWord)) ||
+                (item.getRepairCode() != null && item.getRepairCode().contains(keyWord)) ||
+                (item.getBackUnit() != null && item.getBackUnit().contains(keyWord)) ||
+                (item.getBackPro() != null && item.getBackPro().contains(keyWord)) ||
+                (item.getBackCode() != null && item.getBackCode().contains(keyWord)) ||
+                (item.getCreateName() != null && item.getCreateName().contains(keyWord));
     }
 
     @Override
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java
index 508f47bf..b27428ea 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java
@@ -2,6 +2,10 @@ package com.bonus.material.scrap.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.convert.Convert;
+import com.bonus.common.biz.config.ListPagingUtil;
+import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import com.bonus.material.scrap.domain.vo.ScrapTaskListVo;
@@ -23,7 +27,6 @@ import com.bonus.material.scrap.service.IScrapApplyDetailsService;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.utils.poi.ExcelUtil;
-import com.bonus.common.core.web.page.TableDataInfo;
 
 /**
  * 报废任务详细Controller
@@ -45,10 +48,11 @@ public class ScrapApplyDetailsController extends BaseController {
     @ApiOperation(value = "查询报废任务列表")
 //    @RequiresPermissions("scrap:details:list")
     @GetMapping("/list")
-    public TableDataInfo list(ScrapApplyDetails scrapApplyDetails) {
-        startPage();
+    public AjaxResult list(ScrapApplyDetails scrapApplyDetails) {
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<ScrapTaskListVo> list = scrapApplyDetailsService.selectScrapApplyDetailsList(scrapApplyDetails);
-        return getDataTable(list);
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**
@@ -66,7 +70,7 @@ public class ScrapApplyDetailsController extends BaseController {
      */
     @ApiOperation(value = "导出报废任务详细列表")
     @PreventRepeatSubmit
-    @RequiresPermissions("scrap:details:export")
+    //@RequiresPermissions("scrap:details:export")
     @SysLog(title = "报废任务详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出报废任务详细")
     @PostMapping("/export")
     public void export(HttpServletResponse response, ScrapApplyDetails scrapApplyDetails) {
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java
index 7d744a15..31c6946d 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java
@@ -11,6 +11,7 @@ import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.biz.enums.*;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.basic.domain.BmFileInfo;
@@ -67,7 +68,32 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
      */
     @Override
     public List<ScrapTaskListVo> selectScrapApplyDetailsList(ScrapApplyDetails scrapApplyDetails) {
-        return scrapApplyDetailsMapper.selectScrapApplyDetailsList(scrapApplyDetails);
+        List<ScrapTaskListVo> list = scrapApplyDetailsMapper.selectScrapApplyDetailsList(scrapApplyDetails);
+        if (CollectionUtils.isNotEmpty(list)) {
+            String keyWord = scrapApplyDetails.getKeyWord();
+            // 如果关键字不为空，进行过滤
+            if (!StringUtils.isBlank(keyWord)) {
+                list = list.stream()
+                        .filter(item -> containsKeyword(item, keyWord))
+                        .collect(Collectors.toList());
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 关键字搜索
+     * @param item
+     * @param keyWord
+     * @return
+     */
+    private boolean containsKeyword(ScrapTaskListVo item, String keyWord) {
+        return (item.getType() != null && item.getType().contains(keyWord)) ||
+                (item.getRepairCode() != null && item.getRepairCode().contains(keyWord)) ||
+                (item.getScrapCode() != null && item.getScrapCode().contains(keyWord)) ||
+                (item.getBackUnit() != null && item.getBackUnit().contains(keyWord)) ||
+                (item.getBackPro() != null && item.getBackPro().contains(keyWord)) ||
+                (item.getCreateName() != null && item.getCreateName().contains(keyWord));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
index 47a25202..3e96e7cb 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
@@ -64,25 +64,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id AND mt2.del_flag = '0'
         WHERE
         1=1
-        <if test="keyWord != null  and keyWord != ''">
-            and (
-            bu.unit_name like concat('%', #{keyWord}, '%') or
-            bp.pro_name like concat('%', #{keyWord}, '%') or
-            bai.`code` like concat('%', #{keyWord}, '%') or
-            bai.back_person like concat('%', #{keyWord}, '%') or
-            bai.phone like concat('%', #{keyWord}, '%')
-                )
-        </if>
         <if test="unitId != null">
             and bu.unit_id = #{unitId}
         </if>
-          <if test="proId != null">
+        <if test="proId != null">
             and bp.pro_id = #{proId}
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             <![CDATA[and DATE_FORMAT( bai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
 
         </if>
+        <if test="appTaskStatus != null and appTaskStatus == 0">
+            and tt.task_status = #{appTaskStatus}
+        </if>
+        <if test="appTaskStatus != null and appTaskStatus == 1">
+            and (tt.task_status = 1 or tt.task_status = 2)
+        </if>
         <if test="status != null">
             and tt.task_status = #{status}
         </if>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
index c9a8373d..c7573abe 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
@@ -225,7 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMaInfoByQrCode" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">
         select
-            bqi.id, bqi.qr_code, bqi.type_id as maTypeId, bqi.ma_code, mm.ma_id, mm.ma_status
+            bqi.id as id, bqi.qr_code as qrCode, bqi.type_id as maTypeId, bqi.ma_code as maCode, mm.ma_id as maId, mm.ma_status as maStatus
         from
             bm_qrcode_info bqi
         left join
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartLeaseMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartLeaseMapper.xml
index b34fbc62..51c3851f 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartLeaseMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartLeaseMapper.xml
@@ -36,7 +36,7 @@
                 and p1.task_status = #{taskStatus}
             </if>
             <if test="appTaskStatus != null and appTaskStatus == 0">
-                and p1.task_status = #{taskStatus}
+                and p1.task_status = #{appTaskStatus}
             </if>
             <if test="appTaskStatus != null and appTaskStatus == 1">
                 and (p1.task_status = 1 or p1.task_status = 2)
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
index 9cf36f4b..4f7ccafd 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
@@ -141,15 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierId != null "> and pci.supplier_id = #{supplierId}</if>
             <if test="taxRate != null "> and pci.tax_rate = #{taxRate}</if>
             <if test="taskStatus != null "> and t.task_status = #{taskStatus}</if>
-            <if test="keyWord != null  and keyWord != ''">
-                and (
-                t.code like concat('%', #{keyWord}, '%') or
-                msi.supplier like concat('%', #{keyWord}, '%') or
-                pci.create_by like concat('%', #{keyWord}, '%') or
-                pci.arrival_time like concat('%', #{keyWord}, '%') or
-                pci.create_time like concat('%', #{keyWord}, '%')
-                )
-            </if>
+
         </where>
         order by pci.create_time desc
     </select>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
index a57cb4cd..feb23f59 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
@@ -324,12 +324,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type_repair mtr ON mtr.type_id = rad.type_id
         WHERE
             tk.task_type = #{taskType}
-            <if test="keyword != null and keyword != ''">
-                AND (locate(#{keyword}, su.nick_name) > 0
-                or locate(#{keyword}, tk.CODE) > 0
-                or locate(#{keyword}, bui.unit_name) > 0
-                or locate(#{keyword}, bpl.pro_name) > 0)
-            </if>
             <if test="backUnit != null and backUnit != ''">
                 and bui.unit_id = #{backUnit}
             </if>
@@ -345,9 +339,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="backCode != null and backCode != ''">
                 and locate(#{backCode}, tk.code) > 0
             </if>
-            <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''">
-                and tk.create_time between #{params.beginTime} and #{params.endTime}
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                <![CDATA[and DATE_FORMAT( tk.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
             </if>
+           <if test="appTaskStatus != null and appTaskStatus == 10">
+                and tk.task_status = #{appTaskStatus}
+           </if>
+           <if test="appTaskStatus != null and appTaskStatus == 11">
+                and (tk.task_status = 11 or tk.task_status = 12)
+           </if>
         order by tk.create_time desc
     </select>
 
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
index 7dc80cf1..3a0cd77f 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
@@ -62,21 +62,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inputCode != null and inputCode != ''">
                 AND tt.CODE = #{inputCode}
             </if>
-            <if test="keyWord != null and keyWord != ''">
-                AND (
-                    locate(#{keyWord}, su.nick_name) > 0
-                    or locate(#{keyWord}, tt.CODE) > 0
-                    or locate(#{keyWord}, tt1.CODE) > 0
-                    or locate(#{keyWord}, bui.unit_name) > 0
-                    or locate(#{keyWord}, bpi.pro_name) > 0
-                    or locate(#{keyWord}, su.nick_name) > 0
-                    )
-            </if>
             <if test="taskStatus != null ">
                 AND tt.task_status = #{taskStatus}
             </if>
+            <if test="appTaskStatus != null and appTaskStatus == 0">
+                and tt.task_status = #{appTaskStatus}
+            </if>
+            <if test="appTaskStatus != null and appTaskStatus == 1">
+                and (tt.task_status = 1 or tt.task_status = 2)
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND rd.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
+                <![CDATA[and DATE_FORMAT( rd.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
             </if>
         </where>
         GROUP BY rd.task_id
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
index b662c54c..c2eca528 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
@@ -186,10 +186,6 @@
         left join sys_user su on rd.create_by = su.user_id
         left join sys_user su2 on su2.user_id = rd.repairer
         <where>
-            <if test="keyword != null and keyword != ''">
-                AND (locate(#{keyword}, su.nick_name) > 0
-                or locate(#{keyword}, tt.CODE) > 0)
-            </if>
             <if test="backUnit != null and backUnit != ''">
                 AND bui.unit_id = #{backUnit}
             </if>
@@ -208,6 +204,12 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
             </if>
+            <if test="appTaskStatus != null and appTaskStatus == 0">
+                and tt.task_status = #{appTaskStatus}
+            </if>
+            <if test="appTaskStatus != null and appTaskStatus == 1">
+                and (tt.task_status = 1 or tt.task_status = 2)
+            </if>
         </where>
         GROUP BY rd.task_id,bui.unit_name,bpi.pro_name,bai.code,su.nick_name
         order by tt.create_time desc
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml
index 4157a768..88b48d56 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml
@@ -71,16 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="auditBy != null "> and audit_by = #{auditBy}</if>
             <if test="taskStatus != null "> and tt.task_status = #{taskStatus}</if>
-            <if test="keyWord != null  and keyWord != ''">
-                and (
-                bui.unit_name like concat('%', #{keyWord}, '%') or
-                bpi.pro_name like concat('%', #{keyWord}, '%') or
-                tt.`code` like concat('%', #{keyWord}, '%') or
-                tt2.`code` like concat('%', #{keyWord}, '%') or
-                tt.remark like concat('%', #{keyWord}, '%') or
-                sad.create_by like concat('%', #{keyWord}, '%')
-                )
-            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 <![CDATA[and DATE_FORMAT( sad.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
             </if>