diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
new file mode 100644
index 0000000..639e8a8
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.dto.business;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 负责人分配员工请求实体
+ * @Author: wangpeng
+ * @Date: 2023/3/13 15:53
+ */
+@Data
+@ApiModel
+public class SampleAllocateRequest {
+    @NotNull(message = "实验室检测id不能为空")
+    @ApiModelProperty(value = "实验室检测id", dataType = "Long")
+    private Long id;
+
+    @NotNull(message = "检定人员id不能为空")
+    @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
+    private Long measurePersonId;
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
new file mode 100644
index 0000000..639e8a8
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.dto.business;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 负责人分配员工请求实体
+ * @Author: wangpeng
+ * @Date: 2023/3/13 15:53
+ */
+@Data
+@ApiModel
+public class SampleAllocateRequest {
+    @NotNull(message = "实验室检测id不能为空")
+    @ApiModelProperty(value = "实验室检测id", dataType = "Long")
+    private Long id;
+
+    @NotNull(message = "检定人员id不能为空")
+    @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
+    private Long measurePersonId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 0fdbe21..6d50374 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -22,7 +22,7 @@
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 public class SampleLabExecutiveListResponse {
-    @ApiModelProperty(value = "实验室检测id（退回操作中使用）", dataType = "Long")
+    @ApiModelProperty(value = "实验室检测id（分配、退回操作中使用）", dataType = "Long")
     private Long id;
 
     @ApiModelProperty(value = "样品id", dataType = "Long")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
new file mode 100644
index 0000000..639e8a8
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.dto.business;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 负责人分配员工请求实体
+ * @Author: wangpeng
+ * @Date: 2023/3/13 15:53
+ */
+@Data
+@ApiModel
+public class SampleAllocateRequest {
+    @NotNull(message = "实验室检测id不能为空")
+    @ApiModelProperty(value = "实验室检测id", dataType = "Long")
+    private Long id;
+
+    @NotNull(message = "检定人员id不能为空")
+    @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
+    private Long measurePersonId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 0fdbe21..6d50374 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -22,7 +22,7 @@
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 public class SampleLabExecutiveListResponse {
-    @ApiModelProperty(value = "实验室检测id（退回操作中使用）", dataType = "Long")
+    @ApiModelProperty(value = "实验室检测id（分配、退回操作中使用）", dataType = "Long")
     private Long id;
 
     @ApiModelProperty(value = "样品id", dataType = "Long")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
new file mode 100644
index 0000000..92dcf02
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.dto.equipment;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class EquipmentOrSampleDto {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long")
+    private Long id;
+
+    /**
+     * 设备/样品编号
+     */
+    @ApiModelProperty(value = "设备/样品编号", dataType = "String")
+    private String assetNo;
+
+    /**
+     * 设备/样品名称
+     */
+    @ApiModelProperty(value = "设备/样品名称", dataType = "String")
+    private String assetName;
+
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", dataType = "String")
+    @DictCodeField(message = "类型", cacheName = MeterDictCode.APP_AGGREGATE_QUERY_TYPE)
+    private String assetType;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称不合法", dataType = "String")
+    private String assetTypeName;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
new file mode 100644
index 0000000..639e8a8
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.dto.business;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 负责人分配员工请求实体
+ * @Author: wangpeng
+ * @Date: 2023/3/13 15:53
+ */
+@Data
+@ApiModel
+public class SampleAllocateRequest {
+    @NotNull(message = "实验室检测id不能为空")
+    @ApiModelProperty(value = "实验室检测id", dataType = "Long")
+    private Long id;
+
+    @NotNull(message = "检定人员id不能为空")
+    @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
+    private Long measurePersonId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 0fdbe21..6d50374 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -22,7 +22,7 @@
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 public class SampleLabExecutiveListResponse {
-    @ApiModelProperty(value = "实验室检测id（退回操作中使用）", dataType = "Long")
+    @ApiModelProperty(value = "实验室检测id（分配、退回操作中使用）", dataType = "Long")
     private Long id;
 
     @ApiModelProperty(value = "样品id", dataType = "Long")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
new file mode 100644
index 0000000..92dcf02
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.dto.equipment;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class EquipmentOrSampleDto {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long")
+    private Long id;
+
+    /**
+     * 设备/样品编号
+     */
+    @ApiModelProperty(value = "设备/样品编号", dataType = "String")
+    private String assetNo;
+
+    /**
+     * 设备/样品名称
+     */
+    @ApiModelProperty(value = "设备/样品名称", dataType = "String")
+    private String assetName;
+
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", dataType = "String")
+    @DictCodeField(message = "类型", cacheName = MeterDictCode.APP_AGGREGATE_QUERY_TYPE)
+    private String assetType;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称不合法", dataType = "String")
+    private String assetTypeName;
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 5e59e2e..55b77fe 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -268,7 +268,7 @@
             if (sampleInfo != null) {
                 sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
                 boolean rs = sampleService.updateById(sampleInfo);
-                if (row > 0 & rs) return true;
+                if (row > 0 && rs) return true;
             }
         }
         return row > 0 ? true : false;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
new file mode 100644
index 0000000..639e8a8
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.dto.business;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 负责人分配员工请求实体
+ * @Author: wangpeng
+ * @Date: 2023/3/13 15:53
+ */
+@Data
+@ApiModel
+public class SampleAllocateRequest {
+    @NotNull(message = "实验室检测id不能为空")
+    @ApiModelProperty(value = "实验室检测id", dataType = "Long")
+    private Long id;
+
+    @NotNull(message = "检定人员id不能为空")
+    @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
+    private Long measurePersonId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 0fdbe21..6d50374 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -22,7 +22,7 @@
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 public class SampleLabExecutiveListResponse {
-    @ApiModelProperty(value = "实验室检测id（退回操作中使用）", dataType = "Long")
+    @ApiModelProperty(value = "实验室检测id（分配、退回操作中使用）", dataType = "Long")
     private Long id;
 
     @ApiModelProperty(value = "样品id", dataType = "Long")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
new file mode 100644
index 0000000..92dcf02
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.dto.equipment;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class EquipmentOrSampleDto {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long")
+    private Long id;
+
+    /**
+     * 设备/样品编号
+     */
+    @ApiModelProperty(value = "设备/样品编号", dataType = "String")
+    private String assetNo;
+
+    /**
+     * 设备/样品名称
+     */
+    @ApiModelProperty(value = "设备/样品名称", dataType = "String")
+    private String assetName;
+
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", dataType = "String")
+    @DictCodeField(message = "类型", cacheName = MeterDictCode.APP_AGGREGATE_QUERY_TYPE)
+    private String assetType;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称不合法", dataType = "String")
+    private String assetTypeName;
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 5e59e2e..55b77fe 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -268,7 +268,7 @@
             if (sampleInfo != null) {
                 sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
                 boolean rs = sampleService.updateById(sampleInfo);
-                if (row > 0 & rs) return true;
+                if (row > 0 && rs) return true;
             }
         }
         return row > 0 ? true : false;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 5b23762..c6f5d95 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -216,12 +216,11 @@
     public Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         //本级部门主管可见本部门的检测
         //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
-//        AuthUser user = ShiroKit.getUser();
-//        Assert.isFalse(Objects.isNull(user), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-//        });
-        AuthUser user = new AuthUser();
-        user.setId(1634091003794550786l);
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+
         Map<String, Object> resultMap = selectDirectDept(user);
         if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){
             return new Page<>();
@@ -559,6 +558,18 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public ReturnDTO allocateStaff(SampleAllocateRequest sampleAllocateRequest) {
+        BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo();
+        labExecutiveInfo.setId(sampleAllocateRequest.getId());
+        labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId());
+        labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE);
+        if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
     private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(SampleHandOutListResponse handOut) {
         QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
         wrapper.eq("order_id", handOut.getOrderId());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
new file mode 100644
index 0000000..639e8a8
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.dto.business;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 负责人分配员工请求实体
+ * @Author: wangpeng
+ * @Date: 2023/3/13 15:53
+ */
+@Data
+@ApiModel
+public class SampleAllocateRequest {
+    @NotNull(message = "实验室检测id不能为空")
+    @ApiModelProperty(value = "实验室检测id", dataType = "Long")
+    private Long id;
+
+    @NotNull(message = "检定人员id不能为空")
+    @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
+    private Long measurePersonId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 0fdbe21..6d50374 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -22,7 +22,7 @@
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 public class SampleLabExecutiveListResponse {
-    @ApiModelProperty(value = "实验室检测id（退回操作中使用）", dataType = "Long")
+    @ApiModelProperty(value = "实验室检测id（分配、退回操作中使用）", dataType = "Long")
     private Long id;
 
     @ApiModelProperty(value = "样品id", dataType = "Long")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
new file mode 100644
index 0000000..92dcf02
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.dto.equipment;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class EquipmentOrSampleDto {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long")
+    private Long id;
+
+    /**
+     * 设备/样品编号
+     */
+    @ApiModelProperty(value = "设备/样品编号", dataType = "String")
+    private String assetNo;
+
+    /**
+     * 设备/样品名称
+     */
+    @ApiModelProperty(value = "设备/样品名称", dataType = "String")
+    private String assetName;
+
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", dataType = "String")
+    @DictCodeField(message = "类型", cacheName = MeterDictCode.APP_AGGREGATE_QUERY_TYPE)
+    private String assetType;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称不合法", dataType = "String")
+    private String assetTypeName;
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 5e59e2e..55b77fe 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -268,7 +268,7 @@
             if (sampleInfo != null) {
                 sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
                 boolean rs = sampleService.updateById(sampleInfo);
-                if (row > 0 & rs) return true;
+                if (row > 0 && rs) return true;
             }
         }
         return row > 0 ? true : false;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 5b23762..c6f5d95 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -216,12 +216,11 @@
     public Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         //本级部门主管可见本部门的检测
         //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
-//        AuthUser user = ShiroKit.getUser();
-//        Assert.isFalse(Objects.isNull(user), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-//        });
-        AuthUser user = new AuthUser();
-        user.setId(1634091003794550786l);
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+
         Map<String, Object> resultMap = selectDirectDept(user);
         if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){
             return new Page<>();
@@ -559,6 +558,18 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public ReturnDTO allocateStaff(SampleAllocateRequest sampleAllocateRequest) {
+        BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo();
+        labExecutiveInfo.setId(sampleAllocateRequest.getId());
+        labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId());
+        labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE);
+        if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
     private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(SampleHandOutListResponse handOut) {
         QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
         wrapper.eq("order_id", handOut.getOrderId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 7ff9c16..c0c7c79 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -19,10 +20,7 @@
 import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper;
-import com.casic.missiles.model.equipment.EquipmentFixedAssetFile;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
-import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
-import com.casic.missiles.model.equipment.EquipmentUseLog;
+import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.model.page.PageQuery;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
@@ -360,6 +358,15 @@
         return ReturnUtil.success(logList);
     }
 
+    @Override
+    public Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, EquipmentOrSampleDto request) throws Exception {
+        Page<EquipmentOrSampleDto> resultPage = meterFixedAssetsMapper.queryEquipment(page, request);
+        for (EquipmentOrSampleDto dto : resultPage.getRecords()) {
+            DictCodeUtils.convertDictCodeToName(dto);
+        }
+        return resultPage;
+    }
+
     /**
      * 转换字典code
      *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
new file mode 100644
index 0000000..639e8a8
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.dto.business;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 负责人分配员工请求实体
+ * @Author: wangpeng
+ * @Date: 2023/3/13 15:53
+ */
+@Data
+@ApiModel
+public class SampleAllocateRequest {
+    @NotNull(message = "实验室检测id不能为空")
+    @ApiModelProperty(value = "实验室检测id", dataType = "Long")
+    private Long id;
+
+    @NotNull(message = "检定人员id不能为空")
+    @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
+    private Long measurePersonId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 0fdbe21..6d50374 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -22,7 +22,7 @@
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 public class SampleLabExecutiveListResponse {
-    @ApiModelProperty(value = "实验室检测id（退回操作中使用）", dataType = "Long")
+    @ApiModelProperty(value = "实验室检测id（分配、退回操作中使用）", dataType = "Long")
     private Long id;
 
     @ApiModelProperty(value = "样品id", dataType = "Long")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
new file mode 100644
index 0000000..92dcf02
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.dto.equipment;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class EquipmentOrSampleDto {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long")
+    private Long id;
+
+    /**
+     * 设备/样品编号
+     */
+    @ApiModelProperty(value = "设备/样品编号", dataType = "String")
+    private String assetNo;
+
+    /**
+     * 设备/样品名称
+     */
+    @ApiModelProperty(value = "设备/样品名称", dataType = "String")
+    private String assetName;
+
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", dataType = "String")
+    @DictCodeField(message = "类型", cacheName = MeterDictCode.APP_AGGREGATE_QUERY_TYPE)
+    private String assetType;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称不合法", dataType = "String")
+    private String assetTypeName;
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 5e59e2e..55b77fe 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -268,7 +268,7 @@
             if (sampleInfo != null) {
                 sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
                 boolean rs = sampleService.updateById(sampleInfo);
-                if (row > 0 & rs) return true;
+                if (row > 0 && rs) return true;
             }
         }
         return row > 0 ? true : false;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 5b23762..c6f5d95 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -216,12 +216,11 @@
     public Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         //本级部门主管可见本部门的检测
         //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
-//        AuthUser user = ShiroKit.getUser();
-//        Assert.isFalse(Objects.isNull(user), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-//        });
-        AuthUser user = new AuthUser();
-        user.setId(1634091003794550786l);
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+
         Map<String, Object> resultMap = selectDirectDept(user);
         if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){
             return new Page<>();
@@ -559,6 +558,18 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public ReturnDTO allocateStaff(SampleAllocateRequest sampleAllocateRequest) {
+        BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo();
+        labExecutiveInfo.setId(sampleAllocateRequest.getId());
+        labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId());
+        labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE);
+        if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
     private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(SampleHandOutListResponse handOut) {
         QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
         wrapper.eq("order_id", handOut.getOrderId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 7ff9c16..c0c7c79 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -19,10 +20,7 @@
 import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper;
-import com.casic.missiles.model.equipment.EquipmentFixedAssetFile;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
-import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
-import com.casic.missiles.model.equipment.EquipmentUseLog;
+import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.model.page.PageQuery;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
@@ -360,6 +358,15 @@
         return ReturnUtil.success(logList);
     }
 
+    @Override
+    public Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, EquipmentOrSampleDto request) throws Exception {
+        Page<EquipmentOrSampleDto> resultPage = meterFixedAssetsMapper.queryEquipment(page, request);
+        for (EquipmentOrSampleDto dto : resultPage.getRecords()) {
+            DictCodeUtils.convertDictCodeToName(dto);
+        }
+        return resultPage;
+    }
+
     /**
      * 转换字典code
      *
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index d709c42..b4d8470 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -42,4 +42,7 @@
     ExecutiveDetailResponse executiveDetail(ExecutiveDetailRequest request) throws Exception;
 
     ReturnDTO sampleExecutiveSendBack(ExecutiveSendBackRequest request);
+
+    ReturnDTO allocateStaff(SampleAllocateRequest sampleAllocateRequest);
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index aa330f9..56621d9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -131,6 +131,19 @@
     }
 
     /**
+     * 实验室检测-部门检测-分配（分配给具体人员）
+     */
+    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @PostMapping("/deptExecutive/allocate")
+    @ResponseBody
+    public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
+    }
+
+    /**
      * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
      */
     @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 49463c0..415f03a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -82,7 +82,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
@@ -106,7 +106,7 @@
             and company_province like concat('%',#{request.companyProvince},'%')
         </if>
         <if test="request.companyCity != null and request.companyCity !=''">
-            and company_ity like concat('%',#{request.companyCity},'%')
+            and company_city like concat('%',#{request.companyCity},'%')
         </if>
         <if test="request.companyArea != null and request.companyArea !=''">
             and company_area like concat('%',#{request.companyArea},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
new file mode 100644
index 0000000..639e8a8
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.dto.business;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 负责人分配员工请求实体
+ * @Author: wangpeng
+ * @Date: 2023/3/13 15:53
+ */
+@Data
+@ApiModel
+public class SampleAllocateRequest {
+    @NotNull(message = "实验室检测id不能为空")
+    @ApiModelProperty(value = "实验室检测id", dataType = "Long")
+    private Long id;
+
+    @NotNull(message = "检定人员id不能为空")
+    @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
+    private Long measurePersonId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 0fdbe21..6d50374 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -22,7 +22,7 @@
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 public class SampleLabExecutiveListResponse {
-    @ApiModelProperty(value = "实验室检测id（退回操作中使用）", dataType = "Long")
+    @ApiModelProperty(value = "实验室检测id（分配、退回操作中使用）", dataType = "Long")
     private Long id;
 
     @ApiModelProperty(value = "样品id", dataType = "Long")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
new file mode 100644
index 0000000..92dcf02
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.dto.equipment;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class EquipmentOrSampleDto {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long")
+    private Long id;
+
+    /**
+     * 设备/样品编号
+     */
+    @ApiModelProperty(value = "设备/样品编号", dataType = "String")
+    private String assetNo;
+
+    /**
+     * 设备/样品名称
+     */
+    @ApiModelProperty(value = "设备/样品名称", dataType = "String")
+    private String assetName;
+
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", dataType = "String")
+    @DictCodeField(message = "类型", cacheName = MeterDictCode.APP_AGGREGATE_QUERY_TYPE)
+    private String assetType;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称不合法", dataType = "String")
+    private String assetTypeName;
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 5e59e2e..55b77fe 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -268,7 +268,7 @@
             if (sampleInfo != null) {
                 sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
                 boolean rs = sampleService.updateById(sampleInfo);
-                if (row > 0 & rs) return true;
+                if (row > 0 && rs) return true;
             }
         }
         return row > 0 ? true : false;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 5b23762..c6f5d95 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -216,12 +216,11 @@
     public Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         //本级部门主管可见本部门的检测
         //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
-//        AuthUser user = ShiroKit.getUser();
-//        Assert.isFalse(Objects.isNull(user), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-//        });
-        AuthUser user = new AuthUser();
-        user.setId(1634091003794550786l);
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+
         Map<String, Object> resultMap = selectDirectDept(user);
         if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){
             return new Page<>();
@@ -559,6 +558,18 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public ReturnDTO allocateStaff(SampleAllocateRequest sampleAllocateRequest) {
+        BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo();
+        labExecutiveInfo.setId(sampleAllocateRequest.getId());
+        labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId());
+        labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE);
+        if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
     private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(SampleHandOutListResponse handOut) {
         QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
         wrapper.eq("order_id", handOut.getOrderId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 7ff9c16..c0c7c79 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -19,10 +20,7 @@
 import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper;
-import com.casic.missiles.model.equipment.EquipmentFixedAssetFile;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
-import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
-import com.casic.missiles.model.equipment.EquipmentUseLog;
+import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.model.page.PageQuery;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
@@ -360,6 +358,15 @@
         return ReturnUtil.success(logList);
     }
 
+    @Override
+    public Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, EquipmentOrSampleDto request) throws Exception {
+        Page<EquipmentOrSampleDto> resultPage = meterFixedAssetsMapper.queryEquipment(page, request);
+        for (EquipmentOrSampleDto dto : resultPage.getRecords()) {
+            DictCodeUtils.convertDictCodeToName(dto);
+        }
+        return resultPage;
+    }
+
     /**
      * 转换字典code
      *
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index d709c42..b4d8470 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -42,4 +42,7 @@
     ExecutiveDetailResponse executiveDetail(ExecutiveDetailRequest request) throws Exception;
 
     ReturnDTO sampleExecutiveSendBack(ExecutiveSendBackRequest request);
+
+    ReturnDTO allocateStaff(SampleAllocateRequest sampleAllocateRequest);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java
index 8668cc7..24ce44f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
@@ -48,4 +49,6 @@
     ReturnDTO<EquipmentUseLog> queryUseLogList(Long id) throws Exception;
 
     ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(Long id) throws Exception;
+
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, EquipmentOrSampleDto request) throws Exception;
 }