diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
index b948556..15c4ea7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.mapper.plan.InspectionEquipmentRelationMapper;
 import com.casic.missiles.service.plan.IInspectionEquipmentRelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +40,14 @@
 
     @Override
     public List<InspectionEquipmentRelation> listByInspection(Long inspectionId) {
-        return this.baseMapper.listByInspection(inspectionId);
+        List<InspectionEquipmentRelation> list = this.baseMapper.listByInspection(inspectionId);
+        list.forEach(i-> {
+            try {
+                DictCodeUtils.convertDictCodeToName(i);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
     }
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
index b948556..15c4ea7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.mapper.plan.InspectionEquipmentRelationMapper;
 import com.casic.missiles.service.plan.IInspectionEquipmentRelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +40,14 @@
 
     @Override
     public List<InspectionEquipmentRelation> listByInspection(Long inspectionId) {
-        return this.baseMapper.listByInspection(inspectionId);
+        List<InspectionEquipmentRelation> list = this.baseMapper.listByInspection(inspectionId);
+        list.forEach(i-> {
+            try {
+                DictCodeUtils.convertDictCodeToName(i);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
index da3df9f..d65acf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
@@ -130,8 +130,8 @@
         if(StrUtil.isNotEmpty(queryForm.getManufactureNo()) || StrUtil.isNotEmpty(queryForm.getEquipmentRemark())){
             String sql = "select r.id from eqpt_plan_equipment_relation r WHERE r.plan_id = eqpt_plan.id and r.equipment_id " +
                     "in (select e.id FROM eqpt_equipment_info e WHERE e.is_del = 0" +
-                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format("and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
-                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format("and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format(" and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format(" and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
                     ")";
             queryWrapper.exists(sql);
         }
@@ -213,4 +213,9 @@
             planSummary.setRelationList(relationService.listByPlansAndName(planSummary.getPlanIds(),null));
         }
     }
+
+    @Override
+    public String defaultLab(Long companyId) {
+        return this.baseMapper.defaultLab(companyId);
+    }
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
index b948556..15c4ea7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.mapper.plan.InspectionEquipmentRelationMapper;
 import com.casic.missiles.service.plan.IInspectionEquipmentRelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +40,14 @@
 
     @Override
     public List<InspectionEquipmentRelation> listByInspection(Long inspectionId) {
-        return this.baseMapper.listByInspection(inspectionId);
+        List<InspectionEquipmentRelation> list = this.baseMapper.listByInspection(inspectionId);
+        list.forEach(i-> {
+            try {
+                DictCodeUtils.convertDictCodeToName(i);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
index da3df9f..d65acf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
@@ -130,8 +130,8 @@
         if(StrUtil.isNotEmpty(queryForm.getManufactureNo()) || StrUtil.isNotEmpty(queryForm.getEquipmentRemark())){
             String sql = "select r.id from eqpt_plan_equipment_relation r WHERE r.plan_id = eqpt_plan.id and r.equipment_id " +
                     "in (select e.id FROM eqpt_equipment_info e WHERE e.is_del = 0" +
-                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format("and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
-                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format("and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format(" and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format(" and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
                     ")";
             queryWrapper.exists(sql);
         }
@@ -213,4 +213,9 @@
             planSummary.setRelationList(relationService.listByPlansAndName(planSummary.getPlanIds(),null));
         }
     }
+
+    @Override
+    public String defaultLab(Long companyId) {
+        return this.baseMapper.defaultLab(companyId);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
index ae4ca1e..94d601d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
@@ -85,7 +85,7 @@
 
     @Override
     public List<SubcontractOrder> list(Wrapper<SubcontractOrder> queryWrapper) {
-        return super.list(queryWrapper);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     @Override

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
index b948556..15c4ea7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.mapper.plan.InspectionEquipmentRelationMapper;
 import com.casic.missiles.service.plan.IInspectionEquipmentRelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +40,14 @@
 
     @Override
     public List<InspectionEquipmentRelation> listByInspection(Long inspectionId) {
-        return this.baseMapper.listByInspection(inspectionId);
+        List<InspectionEquipmentRelation> list = this.baseMapper.listByInspection(inspectionId);
+        list.forEach(i-> {
+            try {
+                DictCodeUtils.convertDictCodeToName(i);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
index da3df9f..d65acf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
@@ -130,8 +130,8 @@
         if(StrUtil.isNotEmpty(queryForm.getManufactureNo()) || StrUtil.isNotEmpty(queryForm.getEquipmentRemark())){
             String sql = "select r.id from eqpt_plan_equipment_relation r WHERE r.plan_id = eqpt_plan.id and r.equipment_id " +
                     "in (select e.id FROM eqpt_equipment_info e WHERE e.is_del = 0" +
-                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format("and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
-                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format("and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format(" and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format(" and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
                     ")";
             queryWrapper.exists(sql);
         }
@@ -213,4 +213,9 @@
             planSummary.setRelationList(relationService.listByPlansAndName(planSummary.getPlanIds(),null));
         }
     }
+
+    @Override
+    public String defaultLab(Long companyId) {
+        return this.baseMapper.defaultLab(companyId);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
index ae4ca1e..94d601d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
@@ -85,7 +85,7 @@
 
     @Override
     public List<SubcontractOrder> list(Wrapper<SubcontractOrder> queryWrapper) {
-        return super.list(queryWrapper);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
index 27dd0ae..8ef870c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
@@ -93,6 +93,7 @@
         this.saveOrUpdate(subcontractor);
         staffService.saveBySubcontractor(subcontractor.getId(),form.getStaffList());
         abilityService.saveBySubcontractor(subcontractor.getId(),form.getAbilityList());
+        subcontractor.setApprovalStatus(ApprovalStatusEnum.PASSED);
         // 4. 返回申请记录id
         return subcontractor.getId();
     }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
index b948556..15c4ea7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.mapper.plan.InspectionEquipmentRelationMapper;
 import com.casic.missiles.service.plan.IInspectionEquipmentRelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +40,14 @@
 
     @Override
     public List<InspectionEquipmentRelation> listByInspection(Long inspectionId) {
-        return this.baseMapper.listByInspection(inspectionId);
+        List<InspectionEquipmentRelation> list = this.baseMapper.listByInspection(inspectionId);
+        list.forEach(i-> {
+            try {
+                DictCodeUtils.convertDictCodeToName(i);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
index da3df9f..d65acf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
@@ -130,8 +130,8 @@
         if(StrUtil.isNotEmpty(queryForm.getManufactureNo()) || StrUtil.isNotEmpty(queryForm.getEquipmentRemark())){
             String sql = "select r.id from eqpt_plan_equipment_relation r WHERE r.plan_id = eqpt_plan.id and r.equipment_id " +
                     "in (select e.id FROM eqpt_equipment_info e WHERE e.is_del = 0" +
-                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format("and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
-                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format("and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format(" and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format(" and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
                     ")";
             queryWrapper.exists(sql);
         }
@@ -213,4 +213,9 @@
             planSummary.setRelationList(relationService.listByPlansAndName(planSummary.getPlanIds(),null));
         }
     }
+
+    @Override
+    public String defaultLab(Long companyId) {
+        return this.baseMapper.defaultLab(companyId);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
index ae4ca1e..94d601d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
@@ -85,7 +85,7 @@
 
     @Override
     public List<SubcontractOrder> list(Wrapper<SubcontractOrder> queryWrapper) {
-        return super.list(queryWrapper);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
index 27dd0ae..8ef870c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
@@ -93,6 +93,7 @@
         this.saveOrUpdate(subcontractor);
         staffService.saveBySubcontractor(subcontractor.getId(),form.getStaffList());
         abilityService.saveBySubcontractor(subcontractor.getId(),form.getAbilityList());
+        subcontractor.setApprovalStatus(ApprovalStatusEnum.PASSED);
         // 4. 返回申请记录id
         return subcontractor.getId();
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
index b4bd970..a598126 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
@@ -32,6 +32,10 @@
     public Dept getUserCompany() {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
         Long deptId = user.getDeptId();
+        return getCompanyByDeptId(deptId);
+    }
+
+    public Dept getCompanyByDeptId(Long deptId){
         List<Long> parentDeptIds = deptService.getParentListById(deptId);
         if (CollUtil.isNotEmpty(parentDeptIds)) {
             List<Dept> deptList = new ArrayList<>();

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
index b948556..15c4ea7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.mapper.plan.InspectionEquipmentRelationMapper;
 import com.casic.missiles.service.plan.IInspectionEquipmentRelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +40,14 @@
 
     @Override
     public List<InspectionEquipmentRelation> listByInspection(Long inspectionId) {
-        return this.baseMapper.listByInspection(inspectionId);
+        List<InspectionEquipmentRelation> list = this.baseMapper.listByInspection(inspectionId);
+        list.forEach(i-> {
+            try {
+                DictCodeUtils.convertDictCodeToName(i);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
index da3df9f..d65acf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
@@ -130,8 +130,8 @@
         if(StrUtil.isNotEmpty(queryForm.getManufactureNo()) || StrUtil.isNotEmpty(queryForm.getEquipmentRemark())){
             String sql = "select r.id from eqpt_plan_equipment_relation r WHERE r.plan_id = eqpt_plan.id and r.equipment_id " +
                     "in (select e.id FROM eqpt_equipment_info e WHERE e.is_del = 0" +
-                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format("and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
-                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format("and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format(" and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format(" and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
                     ")";
             queryWrapper.exists(sql);
         }
@@ -213,4 +213,9 @@
             planSummary.setRelationList(relationService.listByPlansAndName(planSummary.getPlanIds(),null));
         }
     }
+
+    @Override
+    public String defaultLab(Long companyId) {
+        return this.baseMapper.defaultLab(companyId);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
index ae4ca1e..94d601d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
@@ -85,7 +85,7 @@
 
     @Override
     public List<SubcontractOrder> list(Wrapper<SubcontractOrder> queryWrapper) {
-        return super.list(queryWrapper);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
index 27dd0ae..8ef870c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
@@ -93,6 +93,7 @@
         this.saveOrUpdate(subcontractor);
         staffService.saveBySubcontractor(subcontractor.getId(),form.getStaffList());
         abilityService.saveBySubcontractor(subcontractor.getId(),form.getAbilityList());
+        subcontractor.setApprovalStatus(ApprovalStatusEnum.PASSED);
         // 4. 返回申请记录id
         return subcontractor.getId();
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
index b4bd970..a598126 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
@@ -32,6 +32,10 @@
     public Dept getUserCompany() {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
         Long deptId = user.getDeptId();
+        return getCompanyByDeptId(deptId);
+    }
+
+    public Dept getCompanyByDeptId(Long deptId){
         List<Long> parentDeptIds = deptService.getParentListById(deptId);
         if (CollUtil.isNotEmpty(parentDeptIds)) {
             List<Dept> deptList = new ArrayList<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
index 43a3134..c9f1197 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService;
 import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.service.system.ISystemLocationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.service.system.ISystemPositionService;
@@ -24,6 +25,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -41,7 +43,7 @@
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SystemLocationServiceImpl extends ServiceImpl<SystemLocationMapper, SystemLocation> implements ISystemLocationService {
 
-    private final AbstractDeptService deptService;
+    private final ISystemDeptService deptService;
     private final AbstractAuthService authService;
     private final IEquipmentInfoService equipmentInfoService;
     private final IEquipmentInfoApprovalService equipmentInfoApprovalService;
@@ -61,16 +63,19 @@
         if(StrUtil.isBlank(chooseDept.getPids()) || StrUtil.count(chooseDept.getPids(),",") <= 1 || StrUtil.count(chooseDept.getPids(),",") > 3){
             throw new BusinessException(501,"请选择连队或分系统");
         }
-        if(StrUtil.count(chooseDept.getPids(),",") == 2){
-            systemLocation.setSubSystemId(null);
-            systemLocation.setDeptId(chooseDeptId);
-            systemLocation.setCompanyId(chooseDept.getPid());
-        }
-        if(StrUtil.count(chooseDept.getPids(),",") == 3){
-            systemLocation.setSubSystemId(chooseDeptId);
-            systemLocation.setDeptId(chooseDept.getPid());
-            systemLocation.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
-        }
+        systemLocation.setDeptId(chooseDeptId);
+        systemLocation.setCompanyId(deptService.getCompanyByDeptId(chooseDeptId).getId());
+
+//        if(StrUtil.count(chooseDept.getPids(),",") == 2){
+//            systemLocation.setSubSystemId(null);
+//            systemLocation.setDeptId(chooseDeptId);
+//            systemLocation.setCompanyId(chooseDept.getPid());
+//        }
+//        if(StrUtil.count(chooseDept.getPids(),",") == 3){
+//            systemLocation.setSubSystemId(chooseDeptId);
+//            systemLocation.setDeptId(chooseDept.getPid());
+//            systemLocation.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
+//        }
     }
 
     @Override
@@ -120,8 +125,9 @@
         QueryWrapper<SystemLocation> queryWrapper = new QueryWrapper<>();
         DataScope dataScope = authService.getLoginUserDataScope();
         if(!ALL_TYPE.equals(dataScope.getScopeEnums())){
-            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
-                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
+            queryWrapper.in("dept_id",dataScope.getDeptIds());
+//            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
+//                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
         }
         if(ObjectUtil.isNotEmpty(positionId)){
             queryWrapper.eq("position_id",positionId);
@@ -130,17 +136,21 @@
             queryWrapper.like("install_location", installLocation);
         }
         if(ObjectUtil.isNotEmpty(searchId)){
-            queryWrapper.and(i->i.eq("company_id", searchId)
-                    .or().eq("dept_id", searchId)
-                    .or().eq("sub_system_id", searchId));
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(searchId);
+            deptIds.addAll(deptService.getIdsByPid(searchId,null));
+            queryWrapper.in("dept_id",deptIds);
+//            queryWrapper.and(i->i.eq("company_id", searchId)
+//                    .or().eq("dept_id", searchId)
+//                    .or().eq("sub_system_id", searchId));
         }
         return queryWrapper;
     }
 
     private void wrapper(SystemLocation systemLocation){
         systemLocation.setCompanyName(deptService.getDeptName(systemLocation.getCompanyId()));
-        systemLocation.setDeptName(deptService.getDeptName(systemLocation.getDeptId()));
-        systemLocation.setSubSystemName(deptService.getDeptName(systemLocation.getSubSystemId()));
+        systemLocation.setDeptName(deptService.getParentsDeptName(systemLocation.getDeptId()));
+        //systemLocation.setSubSystemName(deptService.getDeptName(systemLocation.getSubSystemId()));
         systemLocation.setPositionName(positionService.getNameById(systemLocation.getPositionId()));
     }
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
index b948556..15c4ea7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.mapper.plan.InspectionEquipmentRelationMapper;
 import com.casic.missiles.service.plan.IInspectionEquipmentRelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +40,14 @@
 
     @Override
     public List<InspectionEquipmentRelation> listByInspection(Long inspectionId) {
-        return this.baseMapper.listByInspection(inspectionId);
+        List<InspectionEquipmentRelation> list = this.baseMapper.listByInspection(inspectionId);
+        list.forEach(i-> {
+            try {
+                DictCodeUtils.convertDictCodeToName(i);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
index da3df9f..d65acf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
@@ -130,8 +130,8 @@
         if(StrUtil.isNotEmpty(queryForm.getManufactureNo()) || StrUtil.isNotEmpty(queryForm.getEquipmentRemark())){
             String sql = "select r.id from eqpt_plan_equipment_relation r WHERE r.plan_id = eqpt_plan.id and r.equipment_id " +
                     "in (select e.id FROM eqpt_equipment_info e WHERE e.is_del = 0" +
-                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format("and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
-                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format("and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format(" and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format(" and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
                     ")";
             queryWrapper.exists(sql);
         }
@@ -213,4 +213,9 @@
             planSummary.setRelationList(relationService.listByPlansAndName(planSummary.getPlanIds(),null));
         }
     }
+
+    @Override
+    public String defaultLab(Long companyId) {
+        return this.baseMapper.defaultLab(companyId);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
index ae4ca1e..94d601d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
@@ -85,7 +85,7 @@
 
     @Override
     public List<SubcontractOrder> list(Wrapper<SubcontractOrder> queryWrapper) {
-        return super.list(queryWrapper);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
index 27dd0ae..8ef870c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
@@ -93,6 +93,7 @@
         this.saveOrUpdate(subcontractor);
         staffService.saveBySubcontractor(subcontractor.getId(),form.getStaffList());
         abilityService.saveBySubcontractor(subcontractor.getId(),form.getAbilityList());
+        subcontractor.setApprovalStatus(ApprovalStatusEnum.PASSED);
         // 4. 返回申请记录id
         return subcontractor.getId();
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
index b4bd970..a598126 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
@@ -32,6 +32,10 @@
     public Dept getUserCompany() {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
         Long deptId = user.getDeptId();
+        return getCompanyByDeptId(deptId);
+    }
+
+    public Dept getCompanyByDeptId(Long deptId){
         List<Long> parentDeptIds = deptService.getParentListById(deptId);
         if (CollUtil.isNotEmpty(parentDeptIds)) {
             List<Dept> deptList = new ArrayList<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
index 43a3134..c9f1197 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService;
 import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.service.system.ISystemLocationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.service.system.ISystemPositionService;
@@ -24,6 +25,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -41,7 +43,7 @@
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SystemLocationServiceImpl extends ServiceImpl<SystemLocationMapper, SystemLocation> implements ISystemLocationService {
 
-    private final AbstractDeptService deptService;
+    private final ISystemDeptService deptService;
     private final AbstractAuthService authService;
     private final IEquipmentInfoService equipmentInfoService;
     private final IEquipmentInfoApprovalService equipmentInfoApprovalService;
@@ -61,16 +63,19 @@
         if(StrUtil.isBlank(chooseDept.getPids()) || StrUtil.count(chooseDept.getPids(),",") <= 1 || StrUtil.count(chooseDept.getPids(),",") > 3){
             throw new BusinessException(501,"请选择连队或分系统");
         }
-        if(StrUtil.count(chooseDept.getPids(),",") == 2){
-            systemLocation.setSubSystemId(null);
-            systemLocation.setDeptId(chooseDeptId);
-            systemLocation.setCompanyId(chooseDept.getPid());
-        }
-        if(StrUtil.count(chooseDept.getPids(),",") == 3){
-            systemLocation.setSubSystemId(chooseDeptId);
-            systemLocation.setDeptId(chooseDept.getPid());
-            systemLocation.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
-        }
+        systemLocation.setDeptId(chooseDeptId);
+        systemLocation.setCompanyId(deptService.getCompanyByDeptId(chooseDeptId).getId());
+
+//        if(StrUtil.count(chooseDept.getPids(),",") == 2){
+//            systemLocation.setSubSystemId(null);
+//            systemLocation.setDeptId(chooseDeptId);
+//            systemLocation.setCompanyId(chooseDept.getPid());
+//        }
+//        if(StrUtil.count(chooseDept.getPids(),",") == 3){
+//            systemLocation.setSubSystemId(chooseDeptId);
+//            systemLocation.setDeptId(chooseDept.getPid());
+//            systemLocation.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
+//        }
     }
 
     @Override
@@ -120,8 +125,9 @@
         QueryWrapper<SystemLocation> queryWrapper = new QueryWrapper<>();
         DataScope dataScope = authService.getLoginUserDataScope();
         if(!ALL_TYPE.equals(dataScope.getScopeEnums())){
-            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
-                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
+            queryWrapper.in("dept_id",dataScope.getDeptIds());
+//            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
+//                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
         }
         if(ObjectUtil.isNotEmpty(positionId)){
             queryWrapper.eq("position_id",positionId);
@@ -130,17 +136,21 @@
             queryWrapper.like("install_location", installLocation);
         }
         if(ObjectUtil.isNotEmpty(searchId)){
-            queryWrapper.and(i->i.eq("company_id", searchId)
-                    .or().eq("dept_id", searchId)
-                    .or().eq("sub_system_id", searchId));
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(searchId);
+            deptIds.addAll(deptService.getIdsByPid(searchId,null));
+            queryWrapper.in("dept_id",deptIds);
+//            queryWrapper.and(i->i.eq("company_id", searchId)
+//                    .or().eq("dept_id", searchId)
+//                    .or().eq("sub_system_id", searchId));
         }
         return queryWrapper;
     }
 
     private void wrapper(SystemLocation systemLocation){
         systemLocation.setCompanyName(deptService.getDeptName(systemLocation.getCompanyId()));
-        systemLocation.setDeptName(deptService.getDeptName(systemLocation.getDeptId()));
-        systemLocation.setSubSystemName(deptService.getDeptName(systemLocation.getSubSystemId()));
+        systemLocation.setDeptName(deptService.getParentsDeptName(systemLocation.getDeptId()));
+        //systemLocation.setSubSystemName(deptService.getDeptName(systemLocation.getSubSystemId()));
         systemLocation.setPositionName(positionService.getNameById(systemLocation.getPositionId()));
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
index 017116a..1712a18 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService;
 import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.service.system.ISystemPositionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -24,6 +25,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -41,9 +43,10 @@
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SystemPositionServiceImpl extends ServiceImpl<SystemPositionMapper, SystemPosition> implements ISystemPositionService {
 
-    private final AbstractDeptService deptService;
+//    private final AbstractDeptService deptService;
     private final AbstractAuthService authService;
     private final IEquipmentInfoService equipmentInfoService;
+    private final ISystemDeptService deptService;
     private final IEquipmentInfoApprovalService equipmentInfoApprovalService;
 
     @Override
@@ -60,16 +63,18 @@
         if(StrUtil.isBlank(chooseDept.getPids()) || StrUtil.count(chooseDept.getPids(),",") <= 1 || StrUtil.count(chooseDept.getPids(),",") > 3){
             throw new BusinessException(501,"请选择连队或分系统");
         }
-        if(StrUtil.count(chooseDept.getPids(),",") == 2){
-            systemPosition.setSubSystemId(null);
-            systemPosition.setDeptId(chooseDeptId);
-            systemPosition.setCompanyId(chooseDept.getPid());
-        }
-        if(StrUtil.count(chooseDept.getPids(),",") == 3){
-            systemPosition.setSubSystemId(chooseDeptId);
-            systemPosition.setDeptId(chooseDept.getPid());
-            systemPosition.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
-        }
+        systemPosition.setDeptId(chooseDeptId);
+        systemPosition.setCompanyId(deptService.getCompanyByDeptId(chooseDeptId).getId());
+//        if(StrUtil.count(chooseDept.getPids(),",") == 2){
+//            systemPosition.setSubSystemId(null);
+//            systemPosition.setDeptId(chooseDeptId);
+//            systemPosition.setCompanyId(chooseDept.getPid());
+//        }
+//        if(StrUtil.count(chooseDept.getPids(),",") == 3){
+//            systemPosition.setSubSystemId(chooseDeptId);
+//            systemPosition.setDeptId(chooseDept.getPid());
+//            systemPosition.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
+//        }
     }
 
     @Override
@@ -119,24 +124,29 @@
         QueryWrapper<SystemPosition> queryWrapper = new QueryWrapper<>();
         DataScope dataScope = authService.getLoginUserDataScope();
         if(!ALL_TYPE.equals(dataScope.getScopeEnums())){
-            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
-                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
+            queryWrapper.in("dept_id",dataScope.getDeptIds());
+//            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
+//                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
         }
         if(StrUtil.isNotEmpty(positionName)){
             queryWrapper.like("position_name", positionName);
         }
         if(ObjectUtil.isNotEmpty(searchId)){
-            queryWrapper.and(i->i.eq("company_id", searchId)
-                    .or().eq("dept_id", searchId)
-                    .or().eq("sub_system_id", searchId));
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(searchId);
+            deptIds.addAll(deptService.getIdsByPid(searchId,null));
+            queryWrapper.in("dept_id",deptIds);
+//            queryWrapper.and(i->i.eq("company_id", searchId)
+//                    .or().eq("dept_id", searchId)
+//                    .or().eq("sub_system_id", searchId));
         }
         return queryWrapper;
     }
 
     private void wrapper(SystemPosition systemPosition){
         systemPosition.setCompanyName(deptService.getDeptName(systemPosition.getCompanyId()));
-        systemPosition.setDeptName(deptService.getDeptName(systemPosition.getDeptId()));
-        systemPosition.setSubSystemName(deptService.getDeptName(systemPosition.getSubSystemId()));
+        systemPosition.setDeptName(deptService.getParentsDeptName(systemPosition.getDeptId()));
+        //systemPosition.setSubSystemName(deptService.getDeptName(systemPosition.getSubSystemId()));
     }
 
     @Override

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
index b948556..15c4ea7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.mapper.plan.InspectionEquipmentRelationMapper;
 import com.casic.missiles.service.plan.IInspectionEquipmentRelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +40,14 @@
 
     @Override
     public List<InspectionEquipmentRelation> listByInspection(Long inspectionId) {
-        return this.baseMapper.listByInspection(inspectionId);
+        List<InspectionEquipmentRelation> list = this.baseMapper.listByInspection(inspectionId);
+        list.forEach(i-> {
+            try {
+                DictCodeUtils.convertDictCodeToName(i);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
index da3df9f..d65acf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
@@ -130,8 +130,8 @@
         if(StrUtil.isNotEmpty(queryForm.getManufactureNo()) || StrUtil.isNotEmpty(queryForm.getEquipmentRemark())){
             String sql = "select r.id from eqpt_plan_equipment_relation r WHERE r.plan_id = eqpt_plan.id and r.equipment_id " +
                     "in (select e.id FROM eqpt_equipment_info e WHERE e.is_del = 0" +
-                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format("and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
-                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format("and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format(" and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format(" and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
                     ")";
             queryWrapper.exists(sql);
         }
@@ -213,4 +213,9 @@
             planSummary.setRelationList(relationService.listByPlansAndName(planSummary.getPlanIds(),null));
         }
     }
+
+    @Override
+    public String defaultLab(Long companyId) {
+        return this.baseMapper.defaultLab(companyId);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
index ae4ca1e..94d601d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
@@ -85,7 +85,7 @@
 
     @Override
     public List<SubcontractOrder> list(Wrapper<SubcontractOrder> queryWrapper) {
-        return super.list(queryWrapper);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
index 27dd0ae..8ef870c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
@@ -93,6 +93,7 @@
         this.saveOrUpdate(subcontractor);
         staffService.saveBySubcontractor(subcontractor.getId(),form.getStaffList());
         abilityService.saveBySubcontractor(subcontractor.getId(),form.getAbilityList());
+        subcontractor.setApprovalStatus(ApprovalStatusEnum.PASSED);
         // 4. 返回申请记录id
         return subcontractor.getId();
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
index b4bd970..a598126 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
@@ -32,6 +32,10 @@
     public Dept getUserCompany() {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
         Long deptId = user.getDeptId();
+        return getCompanyByDeptId(deptId);
+    }
+
+    public Dept getCompanyByDeptId(Long deptId){
         List<Long> parentDeptIds = deptService.getParentListById(deptId);
         if (CollUtil.isNotEmpty(parentDeptIds)) {
             List<Dept> deptList = new ArrayList<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
index 43a3134..c9f1197 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService;
 import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.service.system.ISystemLocationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.service.system.ISystemPositionService;
@@ -24,6 +25,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -41,7 +43,7 @@
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SystemLocationServiceImpl extends ServiceImpl<SystemLocationMapper, SystemLocation> implements ISystemLocationService {
 
-    private final AbstractDeptService deptService;
+    private final ISystemDeptService deptService;
     private final AbstractAuthService authService;
     private final IEquipmentInfoService equipmentInfoService;
     private final IEquipmentInfoApprovalService equipmentInfoApprovalService;
@@ -61,16 +63,19 @@
         if(StrUtil.isBlank(chooseDept.getPids()) || StrUtil.count(chooseDept.getPids(),",") <= 1 || StrUtil.count(chooseDept.getPids(),",") > 3){
             throw new BusinessException(501,"请选择连队或分系统");
         }
-        if(StrUtil.count(chooseDept.getPids(),",") == 2){
-            systemLocation.setSubSystemId(null);
-            systemLocation.setDeptId(chooseDeptId);
-            systemLocation.setCompanyId(chooseDept.getPid());
-        }
-        if(StrUtil.count(chooseDept.getPids(),",") == 3){
-            systemLocation.setSubSystemId(chooseDeptId);
-            systemLocation.setDeptId(chooseDept.getPid());
-            systemLocation.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
-        }
+        systemLocation.setDeptId(chooseDeptId);
+        systemLocation.setCompanyId(deptService.getCompanyByDeptId(chooseDeptId).getId());
+
+//        if(StrUtil.count(chooseDept.getPids(),",") == 2){
+//            systemLocation.setSubSystemId(null);
+//            systemLocation.setDeptId(chooseDeptId);
+//            systemLocation.setCompanyId(chooseDept.getPid());
+//        }
+//        if(StrUtil.count(chooseDept.getPids(),",") == 3){
+//            systemLocation.setSubSystemId(chooseDeptId);
+//            systemLocation.setDeptId(chooseDept.getPid());
+//            systemLocation.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
+//        }
     }
 
     @Override
@@ -120,8 +125,9 @@
         QueryWrapper<SystemLocation> queryWrapper = new QueryWrapper<>();
         DataScope dataScope = authService.getLoginUserDataScope();
         if(!ALL_TYPE.equals(dataScope.getScopeEnums())){
-            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
-                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
+            queryWrapper.in("dept_id",dataScope.getDeptIds());
+//            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
+//                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
         }
         if(ObjectUtil.isNotEmpty(positionId)){
             queryWrapper.eq("position_id",positionId);
@@ -130,17 +136,21 @@
             queryWrapper.like("install_location", installLocation);
         }
         if(ObjectUtil.isNotEmpty(searchId)){
-            queryWrapper.and(i->i.eq("company_id", searchId)
-                    .or().eq("dept_id", searchId)
-                    .or().eq("sub_system_id", searchId));
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(searchId);
+            deptIds.addAll(deptService.getIdsByPid(searchId,null));
+            queryWrapper.in("dept_id",deptIds);
+//            queryWrapper.and(i->i.eq("company_id", searchId)
+//                    .or().eq("dept_id", searchId)
+//                    .or().eq("sub_system_id", searchId));
         }
         return queryWrapper;
     }
 
     private void wrapper(SystemLocation systemLocation){
         systemLocation.setCompanyName(deptService.getDeptName(systemLocation.getCompanyId()));
-        systemLocation.setDeptName(deptService.getDeptName(systemLocation.getDeptId()));
-        systemLocation.setSubSystemName(deptService.getDeptName(systemLocation.getSubSystemId()));
+        systemLocation.setDeptName(deptService.getParentsDeptName(systemLocation.getDeptId()));
+        //systemLocation.setSubSystemName(deptService.getDeptName(systemLocation.getSubSystemId()));
         systemLocation.setPositionName(positionService.getNameById(systemLocation.getPositionId()));
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
index 017116a..1712a18 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService;
 import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.service.system.ISystemPositionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -24,6 +25,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -41,9 +43,10 @@
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SystemPositionServiceImpl extends ServiceImpl<SystemPositionMapper, SystemPosition> implements ISystemPositionService {
 
-    private final AbstractDeptService deptService;
+//    private final AbstractDeptService deptService;
     private final AbstractAuthService authService;
     private final IEquipmentInfoService equipmentInfoService;
+    private final ISystemDeptService deptService;
     private final IEquipmentInfoApprovalService equipmentInfoApprovalService;
 
     @Override
@@ -60,16 +63,18 @@
         if(StrUtil.isBlank(chooseDept.getPids()) || StrUtil.count(chooseDept.getPids(),",") <= 1 || StrUtil.count(chooseDept.getPids(),",") > 3){
             throw new BusinessException(501,"请选择连队或分系统");
         }
-        if(StrUtil.count(chooseDept.getPids(),",") == 2){
-            systemPosition.setSubSystemId(null);
-            systemPosition.setDeptId(chooseDeptId);
-            systemPosition.setCompanyId(chooseDept.getPid());
-        }
-        if(StrUtil.count(chooseDept.getPids(),",") == 3){
-            systemPosition.setSubSystemId(chooseDeptId);
-            systemPosition.setDeptId(chooseDept.getPid());
-            systemPosition.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
-        }
+        systemPosition.setDeptId(chooseDeptId);
+        systemPosition.setCompanyId(deptService.getCompanyByDeptId(chooseDeptId).getId());
+//        if(StrUtil.count(chooseDept.getPids(),",") == 2){
+//            systemPosition.setSubSystemId(null);
+//            systemPosition.setDeptId(chooseDeptId);
+//            systemPosition.setCompanyId(chooseDept.getPid());
+//        }
+//        if(StrUtil.count(chooseDept.getPids(),",") == 3){
+//            systemPosition.setSubSystemId(chooseDeptId);
+//            systemPosition.setDeptId(chooseDept.getPid());
+//            systemPosition.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
+//        }
     }
 
     @Override
@@ -119,24 +124,29 @@
         QueryWrapper<SystemPosition> queryWrapper = new QueryWrapper<>();
         DataScope dataScope = authService.getLoginUserDataScope();
         if(!ALL_TYPE.equals(dataScope.getScopeEnums())){
-            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
-                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
+            queryWrapper.in("dept_id",dataScope.getDeptIds());
+//            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
+//                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
         }
         if(StrUtil.isNotEmpty(positionName)){
             queryWrapper.like("position_name", positionName);
         }
         if(ObjectUtil.isNotEmpty(searchId)){
-            queryWrapper.and(i->i.eq("company_id", searchId)
-                    .or().eq("dept_id", searchId)
-                    .or().eq("sub_system_id", searchId));
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(searchId);
+            deptIds.addAll(deptService.getIdsByPid(searchId,null));
+            queryWrapper.in("dept_id",deptIds);
+//            queryWrapper.and(i->i.eq("company_id", searchId)
+//                    .or().eq("dept_id", searchId)
+//                    .or().eq("sub_system_id", searchId));
         }
         return queryWrapper;
     }
 
     private void wrapper(SystemPosition systemPosition){
         systemPosition.setCompanyName(deptService.getDeptName(systemPosition.getCompanyId()));
-        systemPosition.setDeptName(deptService.getDeptName(systemPosition.getDeptId()));
-        systemPosition.setSubSystemName(deptService.getDeptName(systemPosition.getSubSystemId()));
+        systemPosition.setDeptName(deptService.getParentsDeptName(systemPosition.getDeptId()));
+        //systemPosition.setSubSystemName(deptService.getDeptName(systemPosition.getSubSystemId()));
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/plan/IPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/plan/IPlanService.java
index f34f061..5fd75b2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/plan/IPlanService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/plan/IPlanService.java
@@ -31,4 +31,6 @@
 
     PlanSummary exportSummary(PlanSummary planSummary);
 
+    String defaultLab(Long companyId);
+
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
index c004670..0448ebd 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java
@@ -30,6 +30,11 @@
                          @Param("usageStatus")String usageStatus,
                          @Param("equipmentId")Long equipmentId);
 
+    Integer checkInfo(@Param("modelId")Long modelId,
+                     @Param("manufactureNo")String manufactureNo,
+                     @Param("manufacturer")String manufacturer,
+                     @Param("equipmentId")Long equipmentId);
+
     List<EquipmentInfoApproval> selectListPage(@Param("page") Page<EquipmentInfoApproval> page, @Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
 
     List<EquipmentInfoApproval> selectList(@Param("ew") QueryWrapper<EquipmentInfoApproval> queryWrapper);
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
index e5ba812..2b95e83 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanMapper.java
@@ -19,4 +19,7 @@
 
     @Select("SELECT IFNULL(max(RIGHT(plan_no, 12)), 0) from eqpt_plan where plan_type = #{planType}")
     Long selectMaxNo(String planType);
+
+    @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+    String defaultLab(Long companyId);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
index c9f14a9..6814d6e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.subcontract.SubcontractOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -23,10 +24,10 @@
     Long selectMaxNo();
 
     @Override
-    <P extends IPage<SubcontractOrder>> P selectPage(P page, Wrapper<SubcontractOrder> queryWrapper);
+    <P extends IPage<SubcontractOrder>> P selectPage(@Param("page") P page,@Param("ew")  Wrapper<SubcontractOrder> ew);
 
     @Override
-    List<SubcontractOrder> selectList(Wrapper<SubcontractOrder> queryWrapper);
+    List<SubcontractOrder> selectList(@Param("ew") Wrapper<SubcontractOrder> ew);
 
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
index c49776d..ec3d893 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml
@@ -125,14 +125,9 @@
         select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0
         ),
         r1 as (
-        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from (
-        select row_number() over (partition by equipment_id order by id desc) as rn,e.*
-        from eqpt_equipment_info_approval e
-        where equipment_id not in (select id from eqpt_equipment_info where is_del = 1)
-        and equipment_id not in (select id from r2)
-        and approval_type != 3
-        and approval_status in ('1','3','4','6')
-        ) t where t.rn = 1),
+        select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no from
+        from eqpt_equipment_info_approval t
+        where approval_status = '3' and approval_type != 3),
         r as (select *
         from r1
         union all
@@ -148,4 +143,29 @@
         LIMIT 1
     </select>
 
+    <select id="checkInfo" resultType="java.lang.Integer">
+        with
+        r2 as (
+            select id as equipment_id,model_id,manufacture_no,manufacturer from eqpt_equipment_info where is_del = 0
+        ),
+        r1 as (
+            select equipment_id, model_id,manufacture_no,manufacturer
+            from eqpt_equipment_info_approval
+            where approval_status = '3' and approval_type != 3),
+        r as (
+            select *
+            from r1
+            union all
+            select *
+            from r2
+        )
+
+        select count(equipment_id)
+        from r
+        where model_id = #{modelId} and manufacture_no = #{manufactureNo} and manufacturer = #{manufacturer}
+        <if test="equipmentId != null and equipmentId !=''">
+            and equipment_id != #{equipmentId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
index 834f20e..9fa6970 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
@@ -206,11 +206,70 @@
     </sql>
 
     <select id="bizCertificateListPage" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
-        <include refid="selectBizCertificate"/>
-        <if test="ew != null">
-            and
-            ${ew.sqlSegment}
-        </if>
+        SELECT * FROM (
+            WITH biz_cert AS (
+                SELECT
+                    id AS id,
+                    sample_id AS equipment_id,
+                    certificate_report_no AS certificate_no,
+                    certificate_report_name AS certificate_name,
+                    check_organization AS check_organization,
+                    calibration_time AS check_date,
+                    expiration_date AS certificate_valid,
+                    certificate_report_file AS certificate_report_file,
+                    create_time AS create_time,
+                    update_time AS update_time,
+                    '1' as equipment_type
+                FROM biz_business_certificate_report_view
+            ),
+            subcontract_cert AS (
+                SELECT
+                    id,
+                    equipment_id,
+                    certificate_no,
+                    certificate_name,
+                    ( SELECT company_name FROM eqpt_subcontractor WHERE id = subcontractor_id ) AS check_organization,
+                    check_date,
+                    certificate_valid,
+                    certificate_report AS certificate_report_file,
+                    create_time,
+                    update_time ,
+                    '2' as equipment_type
+                FROM eqpt_subcontract_certificate
+            ),
+            all_cert AS (
+                SELECT * FROM biz_cert
+                UNION ALL
+                SELECT * FROM subcontract_cert
+            )
+
+            SELECT
+                c.id as id,
+                e.id as equipmentId,
+                e.equipment_no as equipmentNo,
+                e.equipment_name as equipmentName,
+                e.meter_identify as meterIdentify,
+                e.dept_id as deptId,
+                e.model as model,
+                e.company_id as companyId,
+                e.manufacture_no as manufactureNo,
+                c.certificate_no as certificateNo,
+                c.certificate_name as certificateName,
+                c.check_organization as checkOrganization,
+                c.check_date as checkDate,
+                c.certificate_valid as certificateValid,
+                c.certificate_report_file as minioFileName,
+                c.create_time as createTime,
+                c.update_time as updateTime,
+                c.equipment_type as certificateType
+            FROM
+                all_cert c, eqpt_equipment_info_view e
+            where c.equipment_id = e.id
+            <if test="ew != null">
+                and
+                ${ew.sqlSegment}
+            </if>
+        )T
     </select>
 
     <select id="bizCertificateList" resultType="com.casic.missiles.dto.equipment.EquipmentCertificateDTO">
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
index 8e7387f..4b4905a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java
@@ -151,4 +151,13 @@
             response.getWriter().println(JSON.toJSONString(ResponseData.error("下载文件失败" + e.getMessage())));
         }
     }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "单位id", dataType = "Long", example = "0", paramType = "query", required = true)
+    })
+    @ApiOperation("获取默认实验室")
+    @GetMapping("/defaultLab")
+    public ReturnDTO<List<PlanEquipmentAggr>> defaultLab(Long companyId){
+        return ReturnUtil.success(planService.defaultLab(companyId));
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
index 7b37d2e..0d54a68 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java
@@ -82,14 +82,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方地址
@@ -145,7 +145,7 @@
      */
     @ApiModelProperty(value = "承接时间", dataType = "String")
     @TableField("undertake_time")
-    private String undertakeTime;
+    private Date undertakeTime;
 
     /**
      * 接收状态(字典code)
@@ -172,7 +172,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 流程实例id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
index 6421345..654f9a9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java
@@ -96,14 +96,14 @@
      */
     @ApiModelProperty(value = "预计送达时间", dataType = "String")
     @TableField("plan_deliver_time")
-    private String planDeliverTime;
+    private Date planDeliverTime;
 
     /**
      * 要求检完时间
      */
     @ApiModelProperty(value = "要求检完时间", dataType = "String")
     @TableField("require_over_time")
-    private String requireOverTime;
+    private Date requireOverTime;
 
     /**
      * 委托方联系电话
@@ -132,7 +132,7 @@
 
     @ApiModelProperty(value = "现场检定时间", dataType = "String")
     @TableField("on_site_check_time")
-    private String onSiteCheckTime;
+    private Date onSiteCheckTime;
 
     /**
      * 创建人部门id
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
index 266642b..491ba82 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
@@ -120,6 +120,9 @@
 
     @Override
     public ReturnDTO agreeApproval(BaseApprovalRequest agreeRequest) {
+        if(StrUtil.isBlank(agreeRequest.getComments())){
+            agreeRequest.setComments("同意");
+        }
         return baseApprovalService.agree(agreeRequest);
     }
 
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 bca480e..1611bcd 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
@@ -66,7 +66,12 @@
         if(StrUtil.isNotBlank(deptName)){
             depts = depts.stream().filter(d->d.getSimpleName().contains(deptName)).collect(Collectors.toList());
         }
+
+        if(CollUtil.isEmpty(depts) || depts.size() <= 0){
+            return new ArrayList<>();
+        }
         List<Long> deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+
         List<EquipmentStatisticsList> statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, null,
                 SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED));
         //Map<Long, List<EquipmentStatisticsList>> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
index e20285c..569773a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -191,7 +191,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
index 5b742fe..88e876f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,6 +94,20 @@
 
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(eqptBusinessOrderInfo,businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(eqptBusinessOrderInfo.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getUndertakeTime())){
+            businessOrderInfo.setUndertakeTime(DateUtil.formatDate(eqptBusinessOrderInfo.getUndertakeTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -141,7 +157,7 @@
             wrapper.le("create_time", request.getCreateEndTime());
         }
 
-        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"dept_id",request.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId());
         wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany());
         wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck());
@@ -155,7 +171,7 @@
             String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from eqpt_business_order_sample_relation r where r.order_id = eqpt_business_order_info.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo());
             wrapper.exists(manufactureNoSql);
         }
-
+        wrapper.eq("1","1");
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
@@ -163,7 +179,7 @@
     @Override
     public EqptBusinessOrderInfo warpper(EqptBusinessOrderInfo obj) {
         super.warpper(obj);
-        systemDeptService.getParentsDeptName(obj.getDeptId());
+        obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
         return obj;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
index 4916f29..3f44379 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
@@ -90,13 +90,7 @@
 
     @Override
     public boolean updateEquipmentInfo(EquipmentApprovalForm approvalForm) {
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
+        checkRepeat(approvalForm);
 
         attachmentService.saveByEquipment(approvalForm.getEquipmentId(), approvalForm.getAttachments());
         taskRelationService.saveByEquipment(approvalForm.getEquipmentId(),approvalForm.getTaskInfos());
@@ -116,14 +110,7 @@
         if(haveUnfinishedApproval(approvalForm)){
             throw new BusinessException(500,"设备存在未完成的审批，无法提交新的申请");
         }
-        if(checkRfidRepeat(approvalForm.getRfid(),approvalForm.getEquipmentId())){
-            throw new BusinessException(500,"RFID标签已使用");
-        }
-        String checkLoc = this.checkLocation(approvalForm.getInstallLocationId(),approvalForm.getUsageStatus(),approvalForm.getEquipmentId());
-        if(StrUtil.isNotEmpty(checkLoc)){
-            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
-        }
-
+        checkRepeat(approvalForm);
 
         if(ObjectUtil.isEmpty(approvalForm.getCreateUserId())){
             AuthUser authUser = permissionContext.getAuthService().getLoginUser();
@@ -183,6 +170,21 @@
         return approvalForm.getId();
     }
 
+    private void checkRepeat(EquipmentApprovalForm approvalForm) {
+        if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){
+            throw new BusinessException(500,"RFID标签已使用");
+        }
+        String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId());
+        if(StrUtil.isNotEmpty(checkLoc)){
+            throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc));
+        }
+        Integer checkInfo = this.baseMapper.checkInfo(approvalForm.getModelId(),approvalForm.getManufactureNo(),
+                approvalForm.getManufacturer(),approvalForm.getEquipmentId());
+        if(checkInfo > 0){
+            throw new BusinessException(500,String.format("设备信息已存在"));
+        }
+    }
+
     @Override
     public ReturnDTO submitApproval(ApprovalSubmitRequest submitRequest) {
         EquipmentInfoApproval approval = this.getById(submitRequest.getId());
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 67019d7..57386ec 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
@@ -248,6 +248,7 @@
             }
             queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
             queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
+            queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
             queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
             queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
         }
@@ -907,37 +908,50 @@
 
     @Override
     public Page<EquipmentCertificateDTO> certificateListPage(Page<EquipmentCertificateDTO> page, EquipmentCertificateQueryForm queryForm) {
-        // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有部门的；否则查当前用户所在部门的
-        List<Dept> userDeptList = systemDeptService.getUserDeptList(null);
-        List<Long> userDeptIds = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(userDeptList)) {
-            userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId());
-            userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList());
+        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
+        // 级联前端传入的 查询部门的下级部门
+        Set<Long> formDeptIdSet = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            formDeptIdSet.add(queryForm.getDeptId());
+            formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
         }
-        if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
-            userDeptIds.retainAll(queryForm.getDeptIds());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+            for (Long deptId : queryForm.getDeptIds()) {
+                formDeptIdSet.add(deptId);
+                formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+            }
         }
-        if (ObjectUtil.isNotEmpty(userDeptIds)) {
-            queryForm.setDeptIds(userDeptIds);
-        } else {
-            // userDeptIds 查询结果应为空
-            return page;
+        if(CollUtil.isNotEmpty(formDeptIdSet)){
+            queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
         }
 
-        QueryWrapper<EquipmentCertificateDTO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_report_no", queryForm.getCertificateNo());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_report_name", queryForm.getCertificateName());
+        // 数据权限
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) {
+            List<Long> dataScopeDeptIds = dataScope.getDeptIds();
+            if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
+                dataScopeDeptIds.retainAll(queryForm.getDeptIds());
+            }
+            if (ObjectUtil.isNotEmpty(dataScopeDeptIds)) {
+                queryForm.setDeptIds(dataScopeDeptIds);
+            } else {
+                // dataScopeDeptIds 查询结果应为空
+                queryWrapper.eq("0", "1");
+            }
+        }
+
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateNo()), "c.certificate_no", queryForm.getCertificateNo());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCertificateName()), "c.certificate_name", queryForm.getCertificateName());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "e.equipment_no", queryForm.getEquipmentNo());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()), "e.equipment_name", queryForm.getEquipmentName());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "'西昌卫星发射中心计量测试站'", queryForm.getCheckOrganization());
-        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.expiration_date", queryForm.getCertificateValidStart());
-        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.expiration_date", queryForm.getCertificateValidEnd());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "c.check_organization", queryForm.getCheckOrganization());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCertificateValidStart()), "c.certificate_valid", queryForm.getCertificateValidStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "c.certificate_valid", queryForm.getCertificateValidEnd());
 
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "e.model", queryForm.getModel());
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "e.manufacture_no", queryForm.getManufactureNo());
 
         queryWrapper.eq("e.is_del", 0);
-        queryWrapper.eq("c.approval_status", ApprovalStatusEnum.PASSED);
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "e.dept_id", queryForm.getDeptId());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "e.dept_id", queryForm.getDeptIds());
         queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "e.company_id", queryForm.getCompanyId());
@@ -949,7 +963,7 @@
         queryWrapper.orderByDesc("c.create_time");
         List<EquipmentCertificateDTO> list = this.baseMapper.bizCertificateListPage(page, null, queryWrapper);
         for (EquipmentCertificateDTO certificateDTO : list) {
-            certificateDTO.setDeptName(permissionContext.getDeptService().getDeptName(certificateDTO.getDeptId()));
+            certificateDTO.setDeptName(systemDeptService.getParentsDeptName(certificateDTO.getDeptId()));
             certificateDTO.setCompanyName(permissionContext.getDeptService().getDeptName(certificateDTO.getCompanyId()));
         }
         page.setRecords(list);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index acbdb53..0740af9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -68,8 +68,6 @@
     private final AbstractPermissionContext permissionContext;
     private final AbstractDictService dictService;
 
-
-
     @Override
     @Transactional
     public void add(EquipmentModelInfo modelInfo) {
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 32fb648..1cca29d 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -103,6 +104,17 @@
         BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo();
         BeanUtil.copyProperties(inspectionApproval,businessOrderInfo);
         bizOrderInfoService.initOrderInfo(businessOrderInfo);
+        businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime()));
+        businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime()));
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){
+            businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getRequireOverTime())){
+            businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime()));
+        }
+        if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){
+            businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime()));
+        }
         businessOrderInfo.setDataSource("受检设备系统");
 
         List<BizBusinessOrderSampleRelation> businessOrderSampleRelations = new ArrayList<>();
@@ -151,14 +163,17 @@
         if (StrUtil.isNotEmpty(queryForm.getCreateDeptName())) {
             queryWrapper.like("create_dept_name", queryForm.getCreateDeptName());
         }
+        if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {
+            queryWrapper.like("create_user_name", queryForm.getCreateUserName());
+        }
 
-        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCustomerId()),"",queryForm.getCustomerId());
-        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCustomerName()),"",queryForm.getCustomerName());
+        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())){
             List<Long> deptIds = new ArrayList<>();
             deptIds.add(queryForm.getDeptId());
             deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
-            queryWrapper.in("dept_id",queryForm.getDeptId());
+            queryWrapper.in("create_dept_id",queryForm.getDeptId());
         }
 
         queryWrapper.like(StrUtil.isNotEmpty(queryForm.getMeasureCompany()),"measure_company",queryForm.getMeasureCompany());
@@ -184,7 +199,9 @@
 
     @Override
     public InspectionApproval warpper(InspectionApproval obj) {
-        return super.warpper(obj);
+        super.warpper(obj);
+        obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId()));
+        return obj;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
index b948556..15c4ea7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionEquipmentRelationServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.mapper.plan.InspectionEquipmentRelationMapper;
 import com.casic.missiles.service.plan.IInspectionEquipmentRelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +40,14 @@
 
     @Override
     public List<InspectionEquipmentRelation> listByInspection(Long inspectionId) {
-        return this.baseMapper.listByInspection(inspectionId);
+        List<InspectionEquipmentRelation> list = this.baseMapper.listByInspection(inspectionId);
+        list.forEach(i-> {
+            try {
+                DictCodeUtils.convertDictCodeToName(i);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
index da3df9f..d65acf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanServiceImpl.java
@@ -130,8 +130,8 @@
         if(StrUtil.isNotEmpty(queryForm.getManufactureNo()) || StrUtil.isNotEmpty(queryForm.getEquipmentRemark())){
             String sql = "select r.id from eqpt_plan_equipment_relation r WHERE r.plan_id = eqpt_plan.id and r.equipment_id " +
                     "in (select e.id FROM eqpt_equipment_info e WHERE e.is_del = 0" +
-                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format("and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
-                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format("and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getManufactureNo()) ? String.format(" and e.manufacture_no like '%%%s%%'",queryForm.getManufactureNo()) : "") +
+                    (StrUtil.isNotEmpty(queryForm.getEquipmentRemark()) ? String.format(" and e.remark like '%%%s%%'",queryForm.getEquipmentRemark()) : "") +
                     ")";
             queryWrapper.exists(sql);
         }
@@ -213,4 +213,9 @@
             planSummary.setRelationList(relationService.listByPlansAndName(planSummary.getPlanIds(),null));
         }
     }
+
+    @Override
+    public String defaultLab(Long companyId) {
+        return this.baseMapper.defaultLab(companyId);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
index ae4ca1e..94d601d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
@@ -85,7 +85,7 @@
 
     @Override
     public List<SubcontractOrder> list(Wrapper<SubcontractOrder> queryWrapper) {
-        return super.list(queryWrapper);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
index 27dd0ae..8ef870c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
@@ -93,6 +93,7 @@
         this.saveOrUpdate(subcontractor);
         staffService.saveBySubcontractor(subcontractor.getId(),form.getStaffList());
         abilityService.saveBySubcontractor(subcontractor.getId(),form.getAbilityList());
+        subcontractor.setApprovalStatus(ApprovalStatusEnum.PASSED);
         // 4. 返回申请记录id
         return subcontractor.getId();
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
index b4bd970..a598126 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java
@@ -32,6 +32,10 @@
     public Dept getUserCompany() {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
         Long deptId = user.getDeptId();
+        return getCompanyByDeptId(deptId);
+    }
+
+    public Dept getCompanyByDeptId(Long deptId){
         List<Long> parentDeptIds = deptService.getParentListById(deptId);
         if (CollUtil.isNotEmpty(parentDeptIds)) {
             List<Dept> deptList = new ArrayList<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
index 43a3134..c9f1197 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService;
 import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.service.system.ISystemLocationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.service.system.ISystemPositionService;
@@ -24,6 +25,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -41,7 +43,7 @@
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SystemLocationServiceImpl extends ServiceImpl<SystemLocationMapper, SystemLocation> implements ISystemLocationService {
 
-    private final AbstractDeptService deptService;
+    private final ISystemDeptService deptService;
     private final AbstractAuthService authService;
     private final IEquipmentInfoService equipmentInfoService;
     private final IEquipmentInfoApprovalService equipmentInfoApprovalService;
@@ -61,16 +63,19 @@
         if(StrUtil.isBlank(chooseDept.getPids()) || StrUtil.count(chooseDept.getPids(),",") <= 1 || StrUtil.count(chooseDept.getPids(),",") > 3){
             throw new BusinessException(501,"请选择连队或分系统");
         }
-        if(StrUtil.count(chooseDept.getPids(),",") == 2){
-            systemLocation.setSubSystemId(null);
-            systemLocation.setDeptId(chooseDeptId);
-            systemLocation.setCompanyId(chooseDept.getPid());
-        }
-        if(StrUtil.count(chooseDept.getPids(),",") == 3){
-            systemLocation.setSubSystemId(chooseDeptId);
-            systemLocation.setDeptId(chooseDept.getPid());
-            systemLocation.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
-        }
+        systemLocation.setDeptId(chooseDeptId);
+        systemLocation.setCompanyId(deptService.getCompanyByDeptId(chooseDeptId).getId());
+
+//        if(StrUtil.count(chooseDept.getPids(),",") == 2){
+//            systemLocation.setSubSystemId(null);
+//            systemLocation.setDeptId(chooseDeptId);
+//            systemLocation.setCompanyId(chooseDept.getPid());
+//        }
+//        if(StrUtil.count(chooseDept.getPids(),",") == 3){
+//            systemLocation.setSubSystemId(chooseDeptId);
+//            systemLocation.setDeptId(chooseDept.getPid());
+//            systemLocation.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
+//        }
     }
 
     @Override
@@ -120,8 +125,9 @@
         QueryWrapper<SystemLocation> queryWrapper = new QueryWrapper<>();
         DataScope dataScope = authService.getLoginUserDataScope();
         if(!ALL_TYPE.equals(dataScope.getScopeEnums())){
-            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
-                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
+            queryWrapper.in("dept_id",dataScope.getDeptIds());
+//            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
+//                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
         }
         if(ObjectUtil.isNotEmpty(positionId)){
             queryWrapper.eq("position_id",positionId);
@@ -130,17 +136,21 @@
             queryWrapper.like("install_location", installLocation);
         }
         if(ObjectUtil.isNotEmpty(searchId)){
-            queryWrapper.and(i->i.eq("company_id", searchId)
-                    .or().eq("dept_id", searchId)
-                    .or().eq("sub_system_id", searchId));
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(searchId);
+            deptIds.addAll(deptService.getIdsByPid(searchId,null));
+            queryWrapper.in("dept_id",deptIds);
+//            queryWrapper.and(i->i.eq("company_id", searchId)
+//                    .or().eq("dept_id", searchId)
+//                    .or().eq("sub_system_id", searchId));
         }
         return queryWrapper;
     }
 
     private void wrapper(SystemLocation systemLocation){
         systemLocation.setCompanyName(deptService.getDeptName(systemLocation.getCompanyId()));
-        systemLocation.setDeptName(deptService.getDeptName(systemLocation.getDeptId()));
-        systemLocation.setSubSystemName(deptService.getDeptName(systemLocation.getSubSystemId()));
+        systemLocation.setDeptName(deptService.getParentsDeptName(systemLocation.getDeptId()));
+        //systemLocation.setSubSystemName(deptService.getDeptName(systemLocation.getSubSystemId()));
         systemLocation.setPositionName(positionService.getNameById(systemLocation.getPositionId()));
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
index 017116a..1712a18 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService;
 import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.service.system.ISystemPositionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -24,6 +25,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -41,9 +43,10 @@
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SystemPositionServiceImpl extends ServiceImpl<SystemPositionMapper, SystemPosition> implements ISystemPositionService {
 
-    private final AbstractDeptService deptService;
+//    private final AbstractDeptService deptService;
     private final AbstractAuthService authService;
     private final IEquipmentInfoService equipmentInfoService;
+    private final ISystemDeptService deptService;
     private final IEquipmentInfoApprovalService equipmentInfoApprovalService;
 
     @Override
@@ -60,16 +63,18 @@
         if(StrUtil.isBlank(chooseDept.getPids()) || StrUtil.count(chooseDept.getPids(),",") <= 1 || StrUtil.count(chooseDept.getPids(),",") > 3){
             throw new BusinessException(501,"请选择连队或分系统");
         }
-        if(StrUtil.count(chooseDept.getPids(),",") == 2){
-            systemPosition.setSubSystemId(null);
-            systemPosition.setDeptId(chooseDeptId);
-            systemPosition.setCompanyId(chooseDept.getPid());
-        }
-        if(StrUtil.count(chooseDept.getPids(),",") == 3){
-            systemPosition.setSubSystemId(chooseDeptId);
-            systemPosition.setDeptId(chooseDept.getPid());
-            systemPosition.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
-        }
+        systemPosition.setDeptId(chooseDeptId);
+        systemPosition.setCompanyId(deptService.getCompanyByDeptId(chooseDeptId).getId());
+//        if(StrUtil.count(chooseDept.getPids(),",") == 2){
+//            systemPosition.setSubSystemId(null);
+//            systemPosition.setDeptId(chooseDeptId);
+//            systemPosition.setCompanyId(chooseDept.getPid());
+//        }
+//        if(StrUtil.count(chooseDept.getPids(),",") == 3){
+//            systemPosition.setSubSystemId(chooseDeptId);
+//            systemPosition.setDeptId(chooseDept.getPid());
+//            systemPosition.setCompanyId(deptService.getById(chooseDept.getPid()).getPid());
+//        }
     }
 
     @Override
@@ -119,24 +124,29 @@
         QueryWrapper<SystemPosition> queryWrapper = new QueryWrapper<>();
         DataScope dataScope = authService.getLoginUserDataScope();
         if(!ALL_TYPE.equals(dataScope.getScopeEnums())){
-            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
-                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
+            queryWrapper.in("dept_id",dataScope.getDeptIds());
+//            queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
+//                    .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
         }
         if(StrUtil.isNotEmpty(positionName)){
             queryWrapper.like("position_name", positionName);
         }
         if(ObjectUtil.isNotEmpty(searchId)){
-            queryWrapper.and(i->i.eq("company_id", searchId)
-                    .or().eq("dept_id", searchId)
-                    .or().eq("sub_system_id", searchId));
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(searchId);
+            deptIds.addAll(deptService.getIdsByPid(searchId,null));
+            queryWrapper.in("dept_id",deptIds);
+//            queryWrapper.and(i->i.eq("company_id", searchId)
+//                    .or().eq("dept_id", searchId)
+//                    .or().eq("sub_system_id", searchId));
         }
         return queryWrapper;
     }
 
     private void wrapper(SystemPosition systemPosition){
         systemPosition.setCompanyName(deptService.getDeptName(systemPosition.getCompanyId()));
-        systemPosition.setDeptName(deptService.getDeptName(systemPosition.getDeptId()));
-        systemPosition.setSubSystemName(deptService.getDeptName(systemPosition.getSubSystemId()));
+        systemPosition.setDeptName(deptService.getParentsDeptName(systemPosition.getDeptId()));
+        //systemPosition.setSubSystemName(deptService.getDeptName(systemPosition.getSubSystemId()));
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/plan/IPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/plan/IPlanService.java
index f34f061..5fd75b2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/plan/IPlanService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/plan/IPlanService.java
@@ -31,4 +31,6 @@
 
     PlanSummary exportSummary(PlanSummary planSummary);
 
+    String defaultLab(Long companyId);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java
index 06ab842..0d4155a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java
@@ -14,6 +14,8 @@
      */
     Dept getUserCompany();
 
+    Dept getCompanyByDeptId(Long deptId);
+
     /**
      * 获取用户所属部门（连级）
      * @param companyId 单位id