diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
index a4a501d..8de39c0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
@@ -22,6 +22,8 @@
 
     List<EquipmentBoardList> inCheckEquipmentList(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, @Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
+
     EquipmentInCheckAggr inCheckStatistics(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper,
                                            @Param("unCheckStatus") List<String> unCheckStatus,
                                            @Param("inCheckStatus") List<String> inCheckStatus,

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
index a4a501d..8de39c0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
@@ -22,6 +22,8 @@
 
     List<EquipmentBoardList> inCheckEquipmentList(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, @Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
+
     EquipmentInCheckAggr inCheckStatistics(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper,
                                            @Param("unCheckStatus") List<String> unCheckStatus,
                                            @Param("inCheckStatus") List<String> inCheckStatus,
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index adb0527..24bfdd1 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -104,6 +104,11 @@
             e.certificate_valid as certificateValid,
             e.usage_status as usageStatus,
             e.model as model,
+            e.manufacturer as manufacturer,
+            e.manufacture_no as manufactureNo,
+            e.meter_identify as meterIdentify,
+            e.use_position_id as usePositionId,
+            e.use_position as usePosition,
             r.real_deliver_time,
             '西昌卫星发射中心计量测试站' as checkOrganization,
             r.sample_status as sampleStatus
@@ -116,6 +121,45 @@
         </where>)A
     </select>
 
+    <select id="inCheckEquipmentPage" resultType="com.casic.missiles.dto.board.EquipmentBoardList">
+        select * from
+        (
+        WITH latest_relation AS (
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
+        )
+
+        select
+        e.id as id,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.company_id as companyId,
+        e.dept_id as deptId,
+        e.director_name as directorName,
+        e.certificate_valid as certificateValid,
+        e.usage_status as usageStatus,
+        e.model as model,
+        e.manufacturer as manufacturer,
+        e.manufacture_no as manufactureNo,
+        e.meter_identify as meterIdentify,
+        e.use_position_id as usePositionId,
+        e.use_position as usePosition,
+        r.real_deliver_time,
+        '西昌卫星发射中心计量测试站' as checkOrganization,
+        r.sample_status as sampleStatus
+        from eqpt_equipment_info_view e
+        LEFT JOIN latest_relation r ON e.id = r.sample_id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>)A
+    </select>
+
     <select id="inCheckStatistics" resultType="com.casic.missiles.dto.board.EquipmentInCheckAggr">
         WITH latest_relation AS (
             SELECT *

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
index a4a501d..8de39c0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
@@ -22,6 +22,8 @@
 
     List<EquipmentBoardList> inCheckEquipmentList(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, @Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
+
     EquipmentInCheckAggr inCheckStatistics(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper,
                                            @Param("unCheckStatus") List<String> unCheckStatus,
                                            @Param("inCheckStatus") List<String> inCheckStatus,
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index adb0527..24bfdd1 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -104,6 +104,11 @@
             e.certificate_valid as certificateValid,
             e.usage_status as usageStatus,
             e.model as model,
+            e.manufacturer as manufacturer,
+            e.manufacture_no as manufactureNo,
+            e.meter_identify as meterIdentify,
+            e.use_position_id as usePositionId,
+            e.use_position as usePosition,
             r.real_deliver_time,
             '西昌卫星发射中心计量测试站' as checkOrganization,
             r.sample_status as sampleStatus
@@ -116,6 +121,45 @@
         </where>)A
     </select>
 
+    <select id="inCheckEquipmentPage" resultType="com.casic.missiles.dto.board.EquipmentBoardList">
+        select * from
+        (
+        WITH latest_relation AS (
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
+        )
+
+        select
+        e.id as id,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.company_id as companyId,
+        e.dept_id as deptId,
+        e.director_name as directorName,
+        e.certificate_valid as certificateValid,
+        e.usage_status as usageStatus,
+        e.model as model,
+        e.manufacturer as manufacturer,
+        e.manufacture_no as manufactureNo,
+        e.meter_identify as meterIdentify,
+        e.use_position_id as usePositionId,
+        e.use_position as usePosition,
+        r.real_deliver_time,
+        '西昌卫星发射中心计量测试站' as checkOrganization,
+        r.sample_status as sampleStatus
+        from eqpt_equipment_info_view e
+        LEFT JOIN latest_relation r ON e.id = r.sample_id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>)A
+    </select>
+
     <select id="inCheckStatistics" resultType="com.casic.missiles.dto.board.EquipmentInCheckAggr">
         WITH latest_relation AS (
             SELECT *
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
index f86204a..9f30232 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
@@ -14,9 +14,14 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.board.BoardCalendar;
 import com.casic.missiles.model.board.BoardMessage;
 import com.casic.missiles.model.equipment.EquipmentInfo;
@@ -189,13 +194,14 @@
         return ReturnUtil.success(boardCalendarService.listByCompany(companyId, startDate, endDate));
     }
 
-//    @ApiOperation("在检设备列表")
-//    @GetMapping("/equipment/inCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> inCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.inCheckEquipmentPage(page));
-//    }
-//
+    @ApiOperation("在检设备列表")
+    @PostMapping("/equipment/inCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> inCheckPage(EquipmentQueryForm queryForm){
+        Page<EquipmentBoardList> page = PageFactory.defaultPage();
+        Page<EquipmentBoardList> boardListPage = noticeBoardService.inCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(boardListPage));
+    }
+
 //    @ApiOperation("在检设备统计")
 //    @GetMapping("/equipment/inCheckAggr")
 //    public ReturnDTO<EquipmentInCheckAggr> inCheckAggr(){
@@ -208,15 +214,15 @@
         return ReturnUtil.success(noticeBoardService.inCheckMultiStatistic(deptIds));
     }
 
+    @ApiOperation("待检设备列表")
+    @PostMapping("/equipment/toCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> toCheckPage(EquipmentRemindQueryForm queryForm){
+        Page<EquipmentRemindList> page = PageFactory.defaultPage();
+        Page<EquipmentRemindList> remindListPage = noticeBoardService.toCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(remindListPage));
+    }
 
-//    @ApiOperation("待检设备列表")
-//    @GetMapping("/equipment/toCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> toCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.toCheckEquipmentPage(page));
-//    }
-//
-//    @ApiOperation("待检设备列表")
+//    @ApiOperation("待检设备统计")
 //    @GetMapping("/equipment/toCheckAggr")
 //    public ReturnDTO<List<EquipmentBoardList>> toCheckAggr(){
 //        return ReturnUtil.success(noticeBoardService.toCheckStatistics());

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
index a4a501d..8de39c0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
@@ -22,6 +22,8 @@
 
     List<EquipmentBoardList> inCheckEquipmentList(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, @Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
+
     EquipmentInCheckAggr inCheckStatistics(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper,
                                            @Param("unCheckStatus") List<String> unCheckStatus,
                                            @Param("inCheckStatus") List<String> inCheckStatus,
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index adb0527..24bfdd1 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -104,6 +104,11 @@
             e.certificate_valid as certificateValid,
             e.usage_status as usageStatus,
             e.model as model,
+            e.manufacturer as manufacturer,
+            e.manufacture_no as manufactureNo,
+            e.meter_identify as meterIdentify,
+            e.use_position_id as usePositionId,
+            e.use_position as usePosition,
             r.real_deliver_time,
             '西昌卫星发射中心计量测试站' as checkOrganization,
             r.sample_status as sampleStatus
@@ -116,6 +121,45 @@
         </where>)A
     </select>
 
+    <select id="inCheckEquipmentPage" resultType="com.casic.missiles.dto.board.EquipmentBoardList">
+        select * from
+        (
+        WITH latest_relation AS (
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
+        )
+
+        select
+        e.id as id,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.company_id as companyId,
+        e.dept_id as deptId,
+        e.director_name as directorName,
+        e.certificate_valid as certificateValid,
+        e.usage_status as usageStatus,
+        e.model as model,
+        e.manufacturer as manufacturer,
+        e.manufacture_no as manufactureNo,
+        e.meter_identify as meterIdentify,
+        e.use_position_id as usePositionId,
+        e.use_position as usePosition,
+        r.real_deliver_time,
+        '西昌卫星发射中心计量测试站' as checkOrganization,
+        r.sample_status as sampleStatus
+        from eqpt_equipment_info_view e
+        LEFT JOIN latest_relation r ON e.id = r.sample_id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>)A
+    </select>
+
     <select id="inCheckStatistics" resultType="com.casic.missiles.dto.board.EquipmentInCheckAggr">
         WITH latest_relation AS (
             SELECT *
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
index f86204a..9f30232 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
@@ -14,9 +14,14 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.board.BoardCalendar;
 import com.casic.missiles.model.board.BoardMessage;
 import com.casic.missiles.model.equipment.EquipmentInfo;
@@ -189,13 +194,14 @@
         return ReturnUtil.success(boardCalendarService.listByCompany(companyId, startDate, endDate));
     }
 
-//    @ApiOperation("在检设备列表")
-//    @GetMapping("/equipment/inCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> inCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.inCheckEquipmentPage(page));
-//    }
-//
+    @ApiOperation("在检设备列表")
+    @PostMapping("/equipment/inCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> inCheckPage(EquipmentQueryForm queryForm){
+        Page<EquipmentBoardList> page = PageFactory.defaultPage();
+        Page<EquipmentBoardList> boardListPage = noticeBoardService.inCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(boardListPage));
+    }
+
 //    @ApiOperation("在检设备统计")
 //    @GetMapping("/equipment/inCheckAggr")
 //    public ReturnDTO<EquipmentInCheckAggr> inCheckAggr(){
@@ -208,15 +214,15 @@
         return ReturnUtil.success(noticeBoardService.inCheckMultiStatistic(deptIds));
     }
 
+    @ApiOperation("待检设备列表")
+    @PostMapping("/equipment/toCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> toCheckPage(EquipmentRemindQueryForm queryForm){
+        Page<EquipmentRemindList> page = PageFactory.defaultPage();
+        Page<EquipmentRemindList> remindListPage = noticeBoardService.toCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(remindListPage));
+    }
 
-//    @ApiOperation("待检设备列表")
-//    @GetMapping("/equipment/toCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> toCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.toCheckEquipmentPage(page));
-//    }
-//
-//    @ApiOperation("待检设备列表")
+//    @ApiOperation("待检设备统计")
 //    @GetMapping("/equipment/toCheckAggr")
 //    public ReturnDTO<List<EquipmentBoardList>> toCheckAggr(){
 //        return ReturnUtil.success(noticeBoardService.toCheckStatistics());
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
index 304cf0f..5aaf071 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
@@ -29,8 +29,15 @@
     @ApiModelProperty("设备名称")
     private String equipmentName;
 
+    @ApiModelProperty("规格型号")
     private String model;
 
+    @ApiModelProperty("生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("出厂编号")
+    private String manufactureNo;
+
     /**
      * 所在单位id
      */
@@ -55,9 +62,19 @@
     @ApiModelProperty("负责人")
     private String directorName;
 
+    @ApiModelProperty("设备分类")
     private String category;
+
+    @ApiModelProperty("计量标识")
     private String meterIdentify;
 
+    @ApiModelProperty("使用岗位id")
+    private String usePositionId;
+
+    @ApiModelProperty("使用岗位")
+    private String usePosition;
+
+
     /**
      * 证书有效期
      */

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
index a4a501d..8de39c0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
@@ -22,6 +22,8 @@
 
     List<EquipmentBoardList> inCheckEquipmentList(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, @Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
+
     EquipmentInCheckAggr inCheckStatistics(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper,
                                            @Param("unCheckStatus") List<String> unCheckStatus,
                                            @Param("inCheckStatus") List<String> inCheckStatus,
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index adb0527..24bfdd1 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -104,6 +104,11 @@
             e.certificate_valid as certificateValid,
             e.usage_status as usageStatus,
             e.model as model,
+            e.manufacturer as manufacturer,
+            e.manufacture_no as manufactureNo,
+            e.meter_identify as meterIdentify,
+            e.use_position_id as usePositionId,
+            e.use_position as usePosition,
             r.real_deliver_time,
             '西昌卫星发射中心计量测试站' as checkOrganization,
             r.sample_status as sampleStatus
@@ -116,6 +121,45 @@
         </where>)A
     </select>
 
+    <select id="inCheckEquipmentPage" resultType="com.casic.missiles.dto.board.EquipmentBoardList">
+        select * from
+        (
+        WITH latest_relation AS (
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
+        )
+
+        select
+        e.id as id,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.company_id as companyId,
+        e.dept_id as deptId,
+        e.director_name as directorName,
+        e.certificate_valid as certificateValid,
+        e.usage_status as usageStatus,
+        e.model as model,
+        e.manufacturer as manufacturer,
+        e.manufacture_no as manufactureNo,
+        e.meter_identify as meterIdentify,
+        e.use_position_id as usePositionId,
+        e.use_position as usePosition,
+        r.real_deliver_time,
+        '西昌卫星发射中心计量测试站' as checkOrganization,
+        r.sample_status as sampleStatus
+        from eqpt_equipment_info_view e
+        LEFT JOIN latest_relation r ON e.id = r.sample_id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>)A
+    </select>
+
     <select id="inCheckStatistics" resultType="com.casic.missiles.dto.board.EquipmentInCheckAggr">
         WITH latest_relation AS (
             SELECT *
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
index f86204a..9f30232 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
@@ -14,9 +14,14 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.board.BoardCalendar;
 import com.casic.missiles.model.board.BoardMessage;
 import com.casic.missiles.model.equipment.EquipmentInfo;
@@ -189,13 +194,14 @@
         return ReturnUtil.success(boardCalendarService.listByCompany(companyId, startDate, endDate));
     }
 
-//    @ApiOperation("在检设备列表")
-//    @GetMapping("/equipment/inCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> inCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.inCheckEquipmentPage(page));
-//    }
-//
+    @ApiOperation("在检设备列表")
+    @PostMapping("/equipment/inCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> inCheckPage(EquipmentQueryForm queryForm){
+        Page<EquipmentBoardList> page = PageFactory.defaultPage();
+        Page<EquipmentBoardList> boardListPage = noticeBoardService.inCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(boardListPage));
+    }
+
 //    @ApiOperation("在检设备统计")
 //    @GetMapping("/equipment/inCheckAggr")
 //    public ReturnDTO<EquipmentInCheckAggr> inCheckAggr(){
@@ -208,15 +214,15 @@
         return ReturnUtil.success(noticeBoardService.inCheckMultiStatistic(deptIds));
     }
 
+    @ApiOperation("待检设备列表")
+    @PostMapping("/equipment/toCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> toCheckPage(EquipmentRemindQueryForm queryForm){
+        Page<EquipmentRemindList> page = PageFactory.defaultPage();
+        Page<EquipmentRemindList> remindListPage = noticeBoardService.toCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(remindListPage));
+    }
 
-//    @ApiOperation("待检设备列表")
-//    @GetMapping("/equipment/toCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> toCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.toCheckEquipmentPage(page));
-//    }
-//
-//    @ApiOperation("待检设备列表")
+//    @ApiOperation("待检设备统计")
 //    @GetMapping("/equipment/toCheckAggr")
 //    public ReturnDTO<List<EquipmentBoardList>> toCheckAggr(){
 //        return ReturnUtil.success(noticeBoardService.toCheckStatistics());
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
index 304cf0f..5aaf071 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
@@ -29,8 +29,15 @@
     @ApiModelProperty("设备名称")
     private String equipmentName;
 
+    @ApiModelProperty("规格型号")
     private String model;
 
+    @ApiModelProperty("生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("出厂编号")
+    private String manufactureNo;
+
     /**
      * 所在单位id
      */
@@ -55,9 +62,19 @@
     @ApiModelProperty("负责人")
     private String directorName;
 
+    @ApiModelProperty("设备分类")
     private String category;
+
+    @ApiModelProperty("计量标识")
     private String meterIdentify;
 
+    @ApiModelProperty("使用岗位id")
+    private String usePositionId;
+
+    @ApiModelProperty("使用岗位")
+    private String usePosition;
+
+
     /**
      * 证书有效期
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
index 3240fe9..d5cb203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
@@ -25,6 +25,9 @@
     @ApiModelProperty("部门id")
     private Long deptId;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
     @ApiModelProperty("使用岗位id")
     private String usePositionId;
 

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
index a4a501d..8de39c0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
@@ -22,6 +22,8 @@
 
     List<EquipmentBoardList> inCheckEquipmentList(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, @Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
+
     EquipmentInCheckAggr inCheckStatistics(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper,
                                            @Param("unCheckStatus") List<String> unCheckStatus,
                                            @Param("inCheckStatus") List<String> inCheckStatus,
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index adb0527..24bfdd1 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -104,6 +104,11 @@
             e.certificate_valid as certificateValid,
             e.usage_status as usageStatus,
             e.model as model,
+            e.manufacturer as manufacturer,
+            e.manufacture_no as manufactureNo,
+            e.meter_identify as meterIdentify,
+            e.use_position_id as usePositionId,
+            e.use_position as usePosition,
             r.real_deliver_time,
             '西昌卫星发射中心计量测试站' as checkOrganization,
             r.sample_status as sampleStatus
@@ -116,6 +121,45 @@
         </where>)A
     </select>
 
+    <select id="inCheckEquipmentPage" resultType="com.casic.missiles.dto.board.EquipmentBoardList">
+        select * from
+        (
+        WITH latest_relation AS (
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
+        )
+
+        select
+        e.id as id,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.company_id as companyId,
+        e.dept_id as deptId,
+        e.director_name as directorName,
+        e.certificate_valid as certificateValid,
+        e.usage_status as usageStatus,
+        e.model as model,
+        e.manufacturer as manufacturer,
+        e.manufacture_no as manufactureNo,
+        e.meter_identify as meterIdentify,
+        e.use_position_id as usePositionId,
+        e.use_position as usePosition,
+        r.real_deliver_time,
+        '西昌卫星发射中心计量测试站' as checkOrganization,
+        r.sample_status as sampleStatus
+        from eqpt_equipment_info_view e
+        LEFT JOIN latest_relation r ON e.id = r.sample_id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>)A
+    </select>
+
     <select id="inCheckStatistics" resultType="com.casic.missiles.dto.board.EquipmentInCheckAggr">
         WITH latest_relation AS (
             SELECT *
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
index f86204a..9f30232 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
@@ -14,9 +14,14 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.board.BoardCalendar;
 import com.casic.missiles.model.board.BoardMessage;
 import com.casic.missiles.model.equipment.EquipmentInfo;
@@ -189,13 +194,14 @@
         return ReturnUtil.success(boardCalendarService.listByCompany(companyId, startDate, endDate));
     }
 
-//    @ApiOperation("在检设备列表")
-//    @GetMapping("/equipment/inCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> inCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.inCheckEquipmentPage(page));
-//    }
-//
+    @ApiOperation("在检设备列表")
+    @PostMapping("/equipment/inCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> inCheckPage(EquipmentQueryForm queryForm){
+        Page<EquipmentBoardList> page = PageFactory.defaultPage();
+        Page<EquipmentBoardList> boardListPage = noticeBoardService.inCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(boardListPage));
+    }
+
 //    @ApiOperation("在检设备统计")
 //    @GetMapping("/equipment/inCheckAggr")
 //    public ReturnDTO<EquipmentInCheckAggr> inCheckAggr(){
@@ -208,15 +214,15 @@
         return ReturnUtil.success(noticeBoardService.inCheckMultiStatistic(deptIds));
     }
 
+    @ApiOperation("待检设备列表")
+    @PostMapping("/equipment/toCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> toCheckPage(EquipmentRemindQueryForm queryForm){
+        Page<EquipmentRemindList> page = PageFactory.defaultPage();
+        Page<EquipmentRemindList> remindListPage = noticeBoardService.toCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(remindListPage));
+    }
 
-//    @ApiOperation("待检设备列表")
-//    @GetMapping("/equipment/toCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> toCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.toCheckEquipmentPage(page));
-//    }
-//
-//    @ApiOperation("待检设备列表")
+//    @ApiOperation("待检设备统计")
 //    @GetMapping("/equipment/toCheckAggr")
 //    public ReturnDTO<List<EquipmentBoardList>> toCheckAggr(){
 //        return ReturnUtil.success(noticeBoardService.toCheckStatistics());
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
index 304cf0f..5aaf071 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
@@ -29,8 +29,15 @@
     @ApiModelProperty("设备名称")
     private String equipmentName;
 
+    @ApiModelProperty("规格型号")
     private String model;
 
+    @ApiModelProperty("生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("出厂编号")
+    private String manufactureNo;
+
     /**
      * 所在单位id
      */
@@ -55,9 +62,19 @@
     @ApiModelProperty("负责人")
     private String directorName;
 
+    @ApiModelProperty("设备分类")
     private String category;
+
+    @ApiModelProperty("计量标识")
     private String meterIdentify;
 
+    @ApiModelProperty("使用岗位id")
+    private String usePositionId;
+
+    @ApiModelProperty("使用岗位")
+    private String usePosition;
+
+
     /**
      * 证书有效期
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
index 3240fe9..d5cb203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
@@ -25,6 +25,9 @@
     @ApiModelProperty("部门id")
     private Long deptId;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
     @ApiModelProperty("使用岗位id")
     private String usePositionId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
index 64fcda9..004e25e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
@@ -2,6 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.equipment.EquipmentInfo;
 
 import java.util.List;
@@ -22,6 +26,7 @@
 
     List<CheckStatisticsList> checkStatisticsList();
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, EquipmentQueryForm queryForm);
 
-
+    Page<EquipmentRemindList> toCheckEquipmentPage(Page<EquipmentRemindList> page, EquipmentRemindQueryForm queryForm);
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
index a4a501d..8de39c0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
@@ -22,6 +22,8 @@
 
     List<EquipmentBoardList> inCheckEquipmentList(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, @Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
+
     EquipmentInCheckAggr inCheckStatistics(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper,
                                            @Param("unCheckStatus") List<String> unCheckStatus,
                                            @Param("inCheckStatus") List<String> inCheckStatus,
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index adb0527..24bfdd1 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -104,6 +104,11 @@
             e.certificate_valid as certificateValid,
             e.usage_status as usageStatus,
             e.model as model,
+            e.manufacturer as manufacturer,
+            e.manufacture_no as manufactureNo,
+            e.meter_identify as meterIdentify,
+            e.use_position_id as usePositionId,
+            e.use_position as usePosition,
             r.real_deliver_time,
             '西昌卫星发射中心计量测试站' as checkOrganization,
             r.sample_status as sampleStatus
@@ -116,6 +121,45 @@
         </where>)A
     </select>
 
+    <select id="inCheckEquipmentPage" resultType="com.casic.missiles.dto.board.EquipmentBoardList">
+        select * from
+        (
+        WITH latest_relation AS (
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
+        )
+
+        select
+        e.id as id,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.company_id as companyId,
+        e.dept_id as deptId,
+        e.director_name as directorName,
+        e.certificate_valid as certificateValid,
+        e.usage_status as usageStatus,
+        e.model as model,
+        e.manufacturer as manufacturer,
+        e.manufacture_no as manufactureNo,
+        e.meter_identify as meterIdentify,
+        e.use_position_id as usePositionId,
+        e.use_position as usePosition,
+        r.real_deliver_time,
+        '西昌卫星发射中心计量测试站' as checkOrganization,
+        r.sample_status as sampleStatus
+        from eqpt_equipment_info_view e
+        LEFT JOIN latest_relation r ON e.id = r.sample_id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>)A
+    </select>
+
     <select id="inCheckStatistics" resultType="com.casic.missiles.dto.board.EquipmentInCheckAggr">
         WITH latest_relation AS (
             SELECT *
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
index f86204a..9f30232 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
@@ -14,9 +14,14 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.board.BoardCalendar;
 import com.casic.missiles.model.board.BoardMessage;
 import com.casic.missiles.model.equipment.EquipmentInfo;
@@ -189,13 +194,14 @@
         return ReturnUtil.success(boardCalendarService.listByCompany(companyId, startDate, endDate));
     }
 
-//    @ApiOperation("在检设备列表")
-//    @GetMapping("/equipment/inCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> inCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.inCheckEquipmentPage(page));
-//    }
-//
+    @ApiOperation("在检设备列表")
+    @PostMapping("/equipment/inCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> inCheckPage(EquipmentQueryForm queryForm){
+        Page<EquipmentBoardList> page = PageFactory.defaultPage();
+        Page<EquipmentBoardList> boardListPage = noticeBoardService.inCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(boardListPage));
+    }
+
 //    @ApiOperation("在检设备统计")
 //    @GetMapping("/equipment/inCheckAggr")
 //    public ReturnDTO<EquipmentInCheckAggr> inCheckAggr(){
@@ -208,15 +214,15 @@
         return ReturnUtil.success(noticeBoardService.inCheckMultiStatistic(deptIds));
     }
 
+    @ApiOperation("待检设备列表")
+    @PostMapping("/equipment/toCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> toCheckPage(EquipmentRemindQueryForm queryForm){
+        Page<EquipmentRemindList> page = PageFactory.defaultPage();
+        Page<EquipmentRemindList> remindListPage = noticeBoardService.toCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(remindListPage));
+    }
 
-//    @ApiOperation("待检设备列表")
-//    @GetMapping("/equipment/toCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> toCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.toCheckEquipmentPage(page));
-//    }
-//
-//    @ApiOperation("待检设备列表")
+//    @ApiOperation("待检设备统计")
 //    @GetMapping("/equipment/toCheckAggr")
 //    public ReturnDTO<List<EquipmentBoardList>> toCheckAggr(){
 //        return ReturnUtil.success(noticeBoardService.toCheckStatistics());
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
index 304cf0f..5aaf071 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
@@ -29,8 +29,15 @@
     @ApiModelProperty("设备名称")
     private String equipmentName;
 
+    @ApiModelProperty("规格型号")
     private String model;
 
+    @ApiModelProperty("生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("出厂编号")
+    private String manufactureNo;
+
     /**
      * 所在单位id
      */
@@ -55,9 +62,19 @@
     @ApiModelProperty("负责人")
     private String directorName;
 
+    @ApiModelProperty("设备分类")
     private String category;
+
+    @ApiModelProperty("计量标识")
     private String meterIdentify;
 
+    @ApiModelProperty("使用岗位id")
+    private String usePositionId;
+
+    @ApiModelProperty("使用岗位")
+    private String usePosition;
+
+
     /**
      * 证书有效期
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
index 3240fe9..d5cb203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
@@ -25,6 +25,9 @@
     @ApiModelProperty("部门id")
     private Long deptId;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
     @ApiModelProperty("使用岗位id")
     private String usePositionId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
index 64fcda9..004e25e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
@@ -2,6 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.equipment.EquipmentInfo;
 
 import java.util.List;
@@ -22,6 +26,7 @@
 
     List<CheckStatisticsList> checkStatisticsList();
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, EquipmentQueryForm queryForm);
 
-
+    Page<EquipmentRemindList> toCheckEquipmentPage(Page<EquipmentRemindList> page, EquipmentRemindQueryForm queryForm);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java
index 480f905..c5a0e92 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.impl.board;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -17,6 +18,7 @@
 import com.casic.missiles.dto.equipment.EquipmentQueryForm;
 import com.casic.missiles.dto.equipment.EquipmentRemindList;
 import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.enums.equipment.EquipmentStatusTypeEnum;
 import com.casic.missiles.enums.plan.CheckCompletionEnum;
 import com.casic.missiles.enums.plan.SampleStatusEnum;
@@ -300,22 +302,54 @@
     }
 
 
-    public Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page){
-        QueryWrapper<EquipmentBoardList> queryWrapper = inCheckQueryWrapper(null);
+    public Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, EquipmentQueryForm queryForm){
+        QueryWrapper<EquipmentBoardList> queryWrapper = new QueryWrapper<>();
+        List<Long> deptIds = queryForm.getDeptIds();
+        if(ObjectUtil.isEmpty(deptIds)){
+            deptIds = getScopeOrCurrentDeptIds();
+        }
+        queryWrapper.in(CollUtil.isNotEmpty(deptIds),"e.dept_id",deptIds);
+        queryWrapper.eq("e.equipment_type",EQUIPMENT_TYPE_NORMAL);
+        queryWrapper.eq("e.is_del","0");
+        queryWrapper.in("r.sample_status",SampleStatusEnum.getSampleStatusByCompletion(InCheckSampleStatus));
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUsePosition()), "e.use_position", queryForm.getUsePosition());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()), "e.use_position_id", queryForm.getUsePositionId());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getManufacturer()), "e.manufacturer", queryForm.getManufacturer());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "e.meter_identify", queryForm.getMeterIdentify());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "e.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "e.certificate_valid", queryForm.getCertificateValidEnd());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUsageStatus()), "e.usage_status", queryForm.getUsageStatus());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
 
-        List<EquipmentBoardList> list = this.noticeBoardMapper.inCheckEquipmentList(queryWrapper);
-        list.forEach(i->{
-            i.setCompanyName(permissionContext.getDeptService().getDeptName(i.getCompanyId()));
-            i.setDeptName(permissionContext.getDeptService().getDeptName(i.getDeptId()));
-            i.setCheckCompletion(SampleStatusEnum.getByStatus(i.getSampleStatus()).getCheckCompletion());
-            try {
-                DictCodeUtils.convertDictCodeToName(i);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-        page.setRecords(list);
-        return page;
+        Page<EquipmentBoardList> responsePage = this.noticeBoardMapper.inCheckEquipmentPage(page, queryWrapper);
+        if (Objects.nonNull(responsePage) && CollectionUtil.isNotEmpty(responsePage.getRecords())) {
+            responsePage.getRecords().forEach(i->{
+                i.setCompanyName(permissionContext.getDeptService().getDeptName(i.getCompanyId()));
+                i.setDeptName(permissionContext.getDeptService().getDeptName(i.getDeptId()));
+                i.setCheckCompletion(SampleStatusEnum.getByStatus(i.getSampleStatus()).getCheckCompletion());
+                try {
+                    DictCodeUtils.convertDictCodeToName(i);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+        return responsePage;
+    }
+
+    @Override
+    public Page<EquipmentRemindList> toCheckEquipmentPage(Page<EquipmentRemindList> page, EquipmentRemindQueryForm queryForm) {
+        List<Long> deptIds = queryForm.getDeptIds();
+        if(ObjectUtil.isEmpty(deptIds)){
+            deptIds = getScopeOrCurrentDeptIds();
+        }
+        queryForm.setDeptIds(deptIds);
+        queryForm.setEquipmentType(EQUIPMENT_TYPE_NORMAL);
+        Page<EquipmentRemindList> remindPage = equipmentInfoService.remindListPage(page, queryForm);
+        return remindPage;
     }
 
 

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
index a4a501d..8de39c0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
@@ -22,6 +22,8 @@
 
     List<EquipmentBoardList> inCheckEquipmentList(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, @Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
+
     EquipmentInCheckAggr inCheckStatistics(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper,
                                            @Param("unCheckStatus") List<String> unCheckStatus,
                                            @Param("inCheckStatus") List<String> inCheckStatus,
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index adb0527..24bfdd1 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -104,6 +104,11 @@
             e.certificate_valid as certificateValid,
             e.usage_status as usageStatus,
             e.model as model,
+            e.manufacturer as manufacturer,
+            e.manufacture_no as manufactureNo,
+            e.meter_identify as meterIdentify,
+            e.use_position_id as usePositionId,
+            e.use_position as usePosition,
             r.real_deliver_time,
             '西昌卫星发射中心计量测试站' as checkOrganization,
             r.sample_status as sampleStatus
@@ -116,6 +121,45 @@
         </where>)A
     </select>
 
+    <select id="inCheckEquipmentPage" resultType="com.casic.missiles.dto.board.EquipmentBoardList">
+        select * from
+        (
+        WITH latest_relation AS (
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
+        )
+
+        select
+        e.id as id,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.company_id as companyId,
+        e.dept_id as deptId,
+        e.director_name as directorName,
+        e.certificate_valid as certificateValid,
+        e.usage_status as usageStatus,
+        e.model as model,
+        e.manufacturer as manufacturer,
+        e.manufacture_no as manufactureNo,
+        e.meter_identify as meterIdentify,
+        e.use_position_id as usePositionId,
+        e.use_position as usePosition,
+        r.real_deliver_time,
+        '西昌卫星发射中心计量测试站' as checkOrganization,
+        r.sample_status as sampleStatus
+        from eqpt_equipment_info_view e
+        LEFT JOIN latest_relation r ON e.id = r.sample_id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>)A
+    </select>
+
     <select id="inCheckStatistics" resultType="com.casic.missiles.dto.board.EquipmentInCheckAggr">
         WITH latest_relation AS (
             SELECT *
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
index f86204a..9f30232 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
@@ -14,9 +14,14 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.board.BoardCalendar;
 import com.casic.missiles.model.board.BoardMessage;
 import com.casic.missiles.model.equipment.EquipmentInfo;
@@ -189,13 +194,14 @@
         return ReturnUtil.success(boardCalendarService.listByCompany(companyId, startDate, endDate));
     }
 
-//    @ApiOperation("在检设备列表")
-//    @GetMapping("/equipment/inCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> inCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.inCheckEquipmentPage(page));
-//    }
-//
+    @ApiOperation("在检设备列表")
+    @PostMapping("/equipment/inCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> inCheckPage(EquipmentQueryForm queryForm){
+        Page<EquipmentBoardList> page = PageFactory.defaultPage();
+        Page<EquipmentBoardList> boardListPage = noticeBoardService.inCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(boardListPage));
+    }
+
 //    @ApiOperation("在检设备统计")
 //    @GetMapping("/equipment/inCheckAggr")
 //    public ReturnDTO<EquipmentInCheckAggr> inCheckAggr(){
@@ -208,15 +214,15 @@
         return ReturnUtil.success(noticeBoardService.inCheckMultiStatistic(deptIds));
     }
 
+    @ApiOperation("待检设备列表")
+    @PostMapping("/equipment/toCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> toCheckPage(EquipmentRemindQueryForm queryForm){
+        Page<EquipmentRemindList> page = PageFactory.defaultPage();
+        Page<EquipmentRemindList> remindListPage = noticeBoardService.toCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(remindListPage));
+    }
 
-//    @ApiOperation("待检设备列表")
-//    @GetMapping("/equipment/toCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> toCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.toCheckEquipmentPage(page));
-//    }
-//
-//    @ApiOperation("待检设备列表")
+//    @ApiOperation("待检设备统计")
 //    @GetMapping("/equipment/toCheckAggr")
 //    public ReturnDTO<List<EquipmentBoardList>> toCheckAggr(){
 //        return ReturnUtil.success(noticeBoardService.toCheckStatistics());
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
index 304cf0f..5aaf071 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
@@ -29,8 +29,15 @@
     @ApiModelProperty("设备名称")
     private String equipmentName;
 
+    @ApiModelProperty("规格型号")
     private String model;
 
+    @ApiModelProperty("生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("出厂编号")
+    private String manufactureNo;
+
     /**
      * 所在单位id
      */
@@ -55,9 +62,19 @@
     @ApiModelProperty("负责人")
     private String directorName;
 
+    @ApiModelProperty("设备分类")
     private String category;
+
+    @ApiModelProperty("计量标识")
     private String meterIdentify;
 
+    @ApiModelProperty("使用岗位id")
+    private String usePositionId;
+
+    @ApiModelProperty("使用岗位")
+    private String usePosition;
+
+
     /**
      * 证书有效期
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
index 3240fe9..d5cb203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
@@ -25,6 +25,9 @@
     @ApiModelProperty("部门id")
     private Long deptId;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
     @ApiModelProperty("使用岗位id")
     private String usePositionId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
index 64fcda9..004e25e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
@@ -2,6 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.equipment.EquipmentInfo;
 
 import java.util.List;
@@ -22,6 +26,7 @@
 
     List<CheckStatisticsList> checkStatisticsList();
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, EquipmentQueryForm queryForm);
 
-
+    Page<EquipmentRemindList> toCheckEquipmentPage(Page<EquipmentRemindList> page, EquipmentRemindQueryForm queryForm);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java
index 480f905..c5a0e92 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.impl.board;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -17,6 +18,7 @@
 import com.casic.missiles.dto.equipment.EquipmentQueryForm;
 import com.casic.missiles.dto.equipment.EquipmentRemindList;
 import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.enums.equipment.EquipmentStatusTypeEnum;
 import com.casic.missiles.enums.plan.CheckCompletionEnum;
 import com.casic.missiles.enums.plan.SampleStatusEnum;
@@ -300,22 +302,54 @@
     }
 
 
-    public Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page){
-        QueryWrapper<EquipmentBoardList> queryWrapper = inCheckQueryWrapper(null);
+    public Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, EquipmentQueryForm queryForm){
+        QueryWrapper<EquipmentBoardList> queryWrapper = new QueryWrapper<>();
+        List<Long> deptIds = queryForm.getDeptIds();
+        if(ObjectUtil.isEmpty(deptIds)){
+            deptIds = getScopeOrCurrentDeptIds();
+        }
+        queryWrapper.in(CollUtil.isNotEmpty(deptIds),"e.dept_id",deptIds);
+        queryWrapper.eq("e.equipment_type",EQUIPMENT_TYPE_NORMAL);
+        queryWrapper.eq("e.is_del","0");
+        queryWrapper.in("r.sample_status",SampleStatusEnum.getSampleStatusByCompletion(InCheckSampleStatus));
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUsePosition()), "e.use_position", queryForm.getUsePosition());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()), "e.use_position_id", queryForm.getUsePositionId());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getManufacturer()), "e.manufacturer", queryForm.getManufacturer());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "e.meter_identify", queryForm.getMeterIdentify());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "e.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "e.certificate_valid", queryForm.getCertificateValidEnd());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUsageStatus()), "e.usage_status", queryForm.getUsageStatus());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
 
-        List<EquipmentBoardList> list = this.noticeBoardMapper.inCheckEquipmentList(queryWrapper);
-        list.forEach(i->{
-            i.setCompanyName(permissionContext.getDeptService().getDeptName(i.getCompanyId()));
-            i.setDeptName(permissionContext.getDeptService().getDeptName(i.getDeptId()));
-            i.setCheckCompletion(SampleStatusEnum.getByStatus(i.getSampleStatus()).getCheckCompletion());
-            try {
-                DictCodeUtils.convertDictCodeToName(i);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-        page.setRecords(list);
-        return page;
+        Page<EquipmentBoardList> responsePage = this.noticeBoardMapper.inCheckEquipmentPage(page, queryWrapper);
+        if (Objects.nonNull(responsePage) && CollectionUtil.isNotEmpty(responsePage.getRecords())) {
+            responsePage.getRecords().forEach(i->{
+                i.setCompanyName(permissionContext.getDeptService().getDeptName(i.getCompanyId()));
+                i.setDeptName(permissionContext.getDeptService().getDeptName(i.getDeptId()));
+                i.setCheckCompletion(SampleStatusEnum.getByStatus(i.getSampleStatus()).getCheckCompletion());
+                try {
+                    DictCodeUtils.convertDictCodeToName(i);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+        return responsePage;
+    }
+
+    @Override
+    public Page<EquipmentRemindList> toCheckEquipmentPage(Page<EquipmentRemindList> page, EquipmentRemindQueryForm queryForm) {
+        List<Long> deptIds = queryForm.getDeptIds();
+        if(ObjectUtil.isEmpty(deptIds)){
+            deptIds = getScopeOrCurrentDeptIds();
+        }
+        queryForm.setDeptIds(deptIds);
+        queryForm.setEquipmentType(EQUIPMENT_TYPE_NORMAL);
+        Page<EquipmentRemindList> remindPage = equipmentInfoService.remindListPage(page, queryForm);
+        return remindPage;
     }
 
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index 6bc2cef..ffaf4d1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -271,7 +271,6 @@
             queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId());
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination());
-//            queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination());
 
             if (ObjectUtil.isNotEmpty(queryForm.getGroupId())) {
                 String existSql = String.format("(select id from eqpt_equipment_group_relation  where group_id = %d and equipment_id = eqpt_equipment_info_view.id)", queryForm.getGroupId());

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index d723da8..f4578c8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -142,7 +142,7 @@
                         assigneeList.addAll(directorIds);
                     }
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
+                    //发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
index a4a501d..8de39c0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/NoticeBoardMapper.java
@@ -22,6 +22,8 @@
 
     List<EquipmentBoardList> inCheckEquipmentList(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, @Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper);
+
     EquipmentInCheckAggr inCheckStatistics(@Param("ew") QueryWrapper<EquipmentBoardList> queryWrapper,
                                            @Param("unCheckStatus") List<String> unCheckStatus,
                                            @Param("inCheckStatus") List<String> inCheckStatus,
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index adb0527..24bfdd1 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -104,6 +104,11 @@
             e.certificate_valid as certificateValid,
             e.usage_status as usageStatus,
             e.model as model,
+            e.manufacturer as manufacturer,
+            e.manufacture_no as manufactureNo,
+            e.meter_identify as meterIdentify,
+            e.use_position_id as usePositionId,
+            e.use_position as usePosition,
             r.real_deliver_time,
             '西昌卫星发射中心计量测试站' as checkOrganization,
             r.sample_status as sampleStatus
@@ -116,6 +121,45 @@
         </where>)A
     </select>
 
+    <select id="inCheckEquipmentPage" resultType="com.casic.missiles.dto.board.EquipmentBoardList">
+        select * from
+        (
+        WITH latest_relation AS (
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
+        )
+
+        select
+        e.id as id,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.company_id as companyId,
+        e.dept_id as deptId,
+        e.director_name as directorName,
+        e.certificate_valid as certificateValid,
+        e.usage_status as usageStatus,
+        e.model as model,
+        e.manufacturer as manufacturer,
+        e.manufacture_no as manufactureNo,
+        e.meter_identify as meterIdentify,
+        e.use_position_id as usePositionId,
+        e.use_position as usePosition,
+        r.real_deliver_time,
+        '西昌卫星发射中心计量测试站' as checkOrganization,
+        r.sample_status as sampleStatus
+        from eqpt_equipment_info_view e
+        LEFT JOIN latest_relation r ON e.id = r.sample_id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>)A
+    </select>
+
     <select id="inCheckStatistics" resultType="com.casic.missiles.dto.board.EquipmentInCheckAggr">
         WITH latest_relation AS (
             SELECT *
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
index f86204a..9f30232 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java
@@ -14,9 +14,14 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.board.BoardCalendar;
 import com.casic.missiles.model.board.BoardMessage;
 import com.casic.missiles.model.equipment.EquipmentInfo;
@@ -189,13 +194,14 @@
         return ReturnUtil.success(boardCalendarService.listByCompany(companyId, startDate, endDate));
     }
 
-//    @ApiOperation("在检设备列表")
-//    @GetMapping("/equipment/inCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> inCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.inCheckEquipmentPage(page));
-//    }
-//
+    @ApiOperation("在检设备列表")
+    @PostMapping("/equipment/inCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> inCheckPage(EquipmentQueryForm queryForm){
+        Page<EquipmentBoardList> page = PageFactory.defaultPage();
+        Page<EquipmentBoardList> boardListPage = noticeBoardService.inCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(boardListPage));
+    }
+
 //    @ApiOperation("在检设备统计")
 //    @GetMapping("/equipment/inCheckAggr")
 //    public ReturnDTO<EquipmentInCheckAggr> inCheckAggr(){
@@ -208,15 +214,15 @@
         return ReturnUtil.success(noticeBoardService.inCheckMultiStatistic(deptIds));
     }
 
+    @ApiOperation("待检设备列表")
+    @PostMapping("/equipment/toCheckPage")
+    public ReturnDTO<PageInfoBT<EquipmentBoardList>> toCheckPage(EquipmentRemindQueryForm queryForm){
+        Page<EquipmentRemindList> page = PageFactory.defaultPage();
+        Page<EquipmentRemindList> remindListPage = noticeBoardService.toCheckEquipmentPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(remindListPage));
+    }
 
-//    @ApiOperation("待检设备列表")
-//    @GetMapping("/equipment/toCheckPage")
-//    public ReturnDTO<List<EquipmentBoardList>> toCheckPage(){
-//        Page<EquipmentBoardList> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(noticeBoardService.toCheckEquipmentPage(page));
-//    }
-//
-//    @ApiOperation("待检设备列表")
+//    @ApiOperation("待检设备统计")
 //    @GetMapping("/equipment/toCheckAggr")
 //    public ReturnDTO<List<EquipmentBoardList>> toCheckAggr(){
 //        return ReturnUtil.success(noticeBoardService.toCheckStatistics());
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
index 304cf0f..5aaf071 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/board/EquipmentBoardList.java
@@ -29,8 +29,15 @@
     @ApiModelProperty("设备名称")
     private String equipmentName;
 
+    @ApiModelProperty("规格型号")
     private String model;
 
+    @ApiModelProperty("生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("出厂编号")
+    private String manufactureNo;
+
     /**
      * 所在单位id
      */
@@ -55,9 +62,19 @@
     @ApiModelProperty("负责人")
     private String directorName;
 
+    @ApiModelProperty("设备分类")
     private String category;
+
+    @ApiModelProperty("计量标识")
     private String meterIdentify;
 
+    @ApiModelProperty("使用岗位id")
+    private String usePositionId;
+
+    @ApiModelProperty("使用岗位")
+    private String usePosition;
+
+
     /**
      * 证书有效期
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
index 3240fe9..d5cb203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/plan/InspectionQueryForm.java
@@ -25,6 +25,9 @@
     @ApiModelProperty("部门id")
     private Long deptId;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
     @ApiModelProperty("使用岗位id")
     private String usePositionId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
index 64fcda9..004e25e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/INoticeBoardService.java
@@ -2,6 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.board.*;
+import com.casic.missiles.dto.equipment.EquipmentQueryForm;
+import com.casic.missiles.dto.equipment.EquipmentRemindList;
+import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.model.equipment.EquipmentInfo;
 
 import java.util.List;
@@ -22,6 +26,7 @@
 
     List<CheckStatisticsList> checkStatisticsList();
 
+    Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, EquipmentQueryForm queryForm);
 
-
+    Page<EquipmentRemindList> toCheckEquipmentPage(Page<EquipmentRemindList> page, EquipmentRemindQueryForm queryForm);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java
index 480f905..c5a0e92 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.impl.board;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -17,6 +18,7 @@
 import com.casic.missiles.dto.equipment.EquipmentQueryForm;
 import com.casic.missiles.dto.equipment.EquipmentRemindList;
 import com.casic.missiles.dto.equipment.EquipmentRemindQueryForm;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
 import com.casic.missiles.enums.equipment.EquipmentStatusTypeEnum;
 import com.casic.missiles.enums.plan.CheckCompletionEnum;
 import com.casic.missiles.enums.plan.SampleStatusEnum;
@@ -300,22 +302,54 @@
     }
 
 
-    public Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page){
-        QueryWrapper<EquipmentBoardList> queryWrapper = inCheckQueryWrapper(null);
+    public Page<EquipmentBoardList> inCheckEquipmentPage(Page<EquipmentBoardList> page, EquipmentQueryForm queryForm){
+        QueryWrapper<EquipmentBoardList> queryWrapper = new QueryWrapper<>();
+        List<Long> deptIds = queryForm.getDeptIds();
+        if(ObjectUtil.isEmpty(deptIds)){
+            deptIds = getScopeOrCurrentDeptIds();
+        }
+        queryWrapper.in(CollUtil.isNotEmpty(deptIds),"e.dept_id",deptIds);
+        queryWrapper.eq("e.equipment_type",EQUIPMENT_TYPE_NORMAL);
+        queryWrapper.eq("e.is_del","0");
+        queryWrapper.in("r.sample_status",SampleStatusEnum.getSampleStatusByCompletion(InCheckSampleStatus));
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUsePosition()), "e.use_position", queryForm.getUsePosition());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()), "e.use_position_id", queryForm.getUsePositionId());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getManufacturer()), "e.manufacturer", queryForm.getManufacturer());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "e.meter_identify", queryForm.getMeterIdentify());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "e.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "e.certificate_valid", queryForm.getCertificateValidEnd());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getUsageStatus()), "e.usage_status", queryForm.getUsageStatus());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
 
-        List<EquipmentBoardList> list = this.noticeBoardMapper.inCheckEquipmentList(queryWrapper);
-        list.forEach(i->{
-            i.setCompanyName(permissionContext.getDeptService().getDeptName(i.getCompanyId()));
-            i.setDeptName(permissionContext.getDeptService().getDeptName(i.getDeptId()));
-            i.setCheckCompletion(SampleStatusEnum.getByStatus(i.getSampleStatus()).getCheckCompletion());
-            try {
-                DictCodeUtils.convertDictCodeToName(i);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-        page.setRecords(list);
-        return page;
+        Page<EquipmentBoardList> responsePage = this.noticeBoardMapper.inCheckEquipmentPage(page, queryWrapper);
+        if (Objects.nonNull(responsePage) && CollectionUtil.isNotEmpty(responsePage.getRecords())) {
+            responsePage.getRecords().forEach(i->{
+                i.setCompanyName(permissionContext.getDeptService().getDeptName(i.getCompanyId()));
+                i.setDeptName(permissionContext.getDeptService().getDeptName(i.getDeptId()));
+                i.setCheckCompletion(SampleStatusEnum.getByStatus(i.getSampleStatus()).getCheckCompletion());
+                try {
+                    DictCodeUtils.convertDictCodeToName(i);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+        return responsePage;
+    }
+
+    @Override
+    public Page<EquipmentRemindList> toCheckEquipmentPage(Page<EquipmentRemindList> page, EquipmentRemindQueryForm queryForm) {
+        List<Long> deptIds = queryForm.getDeptIds();
+        if(ObjectUtil.isEmpty(deptIds)){
+            deptIds = getScopeOrCurrentDeptIds();
+        }
+        queryForm.setDeptIds(deptIds);
+        queryForm.setEquipmentType(EQUIPMENT_TYPE_NORMAL);
+        Page<EquipmentRemindList> remindPage = equipmentInfoService.remindListPage(page, queryForm);
+        return remindPage;
     }
 
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index 6bc2cef..ffaf4d1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -271,7 +271,6 @@
             queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId());
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination());
-//            queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination());
 
             if (ObjectUtil.isNotEmpty(queryForm.getGroupId())) {
                 String existSql = String.format("(select id from eqpt_equipment_group_relation  where group_id = %d and equipment_id = eqpt_equipment_info_view.id)", queryForm.getGroupId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java
index eb520d9..559782c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java
@@ -33,6 +33,7 @@
 import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import liquibase.pro.packaged.A;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -60,8 +61,6 @@
     @Autowired
     private IInspectionEquipmentRelationService relationService;
     @Autowired
-    private IPlanEquipmentRelationService planEquipmentRelationService;
-    @Autowired
     private IBizBusinessOrderInfoService bizOrderInfoService;
     @Autowired
     private IEqptBusinessOrderInfoService eqptOrderInfoService;
@@ -174,7 +173,7 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
             queryWrapper.like("create_user_name", queryForm.getCreateUserName());
         }
-
+        queryWrapper.like(StringUtils.isNotBlank(queryForm.getDeliverer()), "deliverer", queryForm.getDeliverer());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"customer_id",queryForm.getCustomerId());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"customer_name",queryForm.getCustomerName());
         if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){