diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 9e8af1f..415b42a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -47,13 +47,14 @@
     <!-- 查询管理状态不是报废，上次检定日期距离和当前时间相差的月份>=检定周期-1(提前30天)-->
     <select id="remindListPage" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            *
+            efa.*, su.NAME AS usePersonName
         FROM
-            equipment_fixed_assets
+            equipment_fixed_assets efa
+        LEFT JOIN sys_user su ON efa.use_person = su.ID
         WHERE
-            is_del = 0
-	    AND manager_state != 4
-	    AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
+            efa.is_del = 0
+	    AND efa.manager_state != 4
+	    AND IFNULL( TIMESTAMPDIFF( MONTH, efa.mesure_date, curdate()), 0 ) >= efa.mesure_cycle - 1
     </select>
 
     <select id="queryVerifiedNum" resultType="int">

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 9e8af1f..415b42a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -47,13 +47,14 @@
     <!-- 查询管理状态不是报废，上次检定日期距离和当前时间相差的月份>=检定周期-1(提前30天)-->
     <select id="remindListPage" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            *
+            efa.*, su.NAME AS usePersonName
         FROM
-            equipment_fixed_assets
+            equipment_fixed_assets efa
+        LEFT JOIN sys_user su ON efa.use_person = su.ID
         WHERE
-            is_del = 0
-	    AND manager_state != 4
-	    AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
+            efa.is_del = 0
+	    AND efa.manager_state != 4
+	    AND IFNULL( TIMESTAMPDIFF( MONTH, efa.mesure_date, curdate()), 0 ) >= efa.mesure_cycle - 1
     </select>
 
     <select id="queryVerifiedNum" resultType="int">
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index e88f049..213f913 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -66,7 +66,7 @@
                 and t1.certificate_no like concat('%', #{request.verifierCertificateNo}, '%')
             </if>
             <if test="request.certificateStatus != null  and request.certificateStatus != ''">
-                and t1.certificate_status = #{request.certificateStatus}
+<!--                and t1.certificate_status = #{request.certificateStatus}-->
                 <if test="request.certificateStatus == 0">
                     and NOW() &lt; t1.valid_date
                 </if>

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 9e8af1f..415b42a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -47,13 +47,14 @@
     <!-- 查询管理状态不是报废，上次检定日期距离和当前时间相差的月份>=检定周期-1(提前30天)-->
     <select id="remindListPage" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            *
+            efa.*, su.NAME AS usePersonName
         FROM
-            equipment_fixed_assets
+            equipment_fixed_assets efa
+        LEFT JOIN sys_user su ON efa.use_person = su.ID
         WHERE
-            is_del = 0
-	    AND manager_state != 4
-	    AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
+            efa.is_del = 0
+	    AND efa.manager_state != 4
+	    AND IFNULL( TIMESTAMPDIFF( MONTH, efa.mesure_date, curdate()), 0 ) >= efa.mesure_cycle - 1
     </select>
 
     <select id="queryVerifiedNum" resultType="int">
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index e88f049..213f913 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -66,7 +66,7 @@
                 and t1.certificate_no like concat('%', #{request.verifierCertificateNo}, '%')
             </if>
             <if test="request.certificateStatus != null  and request.certificateStatus != ''">
-                and t1.certificate_status = #{request.certificateStatus}
+<!--                and t1.certificate_status = #{request.certificateStatus}-->
                 <if test="request.certificateStatus == 0">
                     and NOW() &lt; t1.valid_date
                 </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 418da3c..191c565 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -31,7 +31,7 @@
     private String orderCode;
 
     @ApiModelProperty(value = "委托方id", dataType = "String")
-    @ExcelProperty(value = "委托方id",order = 1)
+//    @ExcelProperty(value = "委托方id",order = 1)
     private String customerId;
 
     @ApiModelProperty(value = "委托方编号", dataType = "String")

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 9e8af1f..415b42a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -47,13 +47,14 @@
     <!-- 查询管理状态不是报废，上次检定日期距离和当前时间相差的月份>=检定周期-1(提前30天)-->
     <select id="remindListPage" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            *
+            efa.*, su.NAME AS usePersonName
         FROM
-            equipment_fixed_assets
+            equipment_fixed_assets efa
+        LEFT JOIN sys_user su ON efa.use_person = su.ID
         WHERE
-            is_del = 0
-	    AND manager_state != 4
-	    AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
+            efa.is_del = 0
+	    AND efa.manager_state != 4
+	    AND IFNULL( TIMESTAMPDIFF( MONTH, efa.mesure_date, curdate()), 0 ) >= efa.mesure_cycle - 1
     </select>
 
     <select id="queryVerifiedNum" resultType="int">
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index e88f049..213f913 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -66,7 +66,7 @@
                 and t1.certificate_no like concat('%', #{request.verifierCertificateNo}, '%')
             </if>
             <if test="request.certificateStatus != null  and request.certificateStatus != ''">
-                and t1.certificate_status = #{request.certificateStatus}
+<!--                and t1.certificate_status = #{request.certificateStatus}-->
                 <if test="request.certificateStatus == 0">
                     and NOW() &lt; t1.valid_date
                 </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 418da3c..191c565 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -31,7 +31,7 @@
     private String orderCode;
 
     @ApiModelProperty(value = "委托方id", dataType = "String")
-    @ExcelProperty(value = "委托方id",order = 1)
+//    @ExcelProperty(value = "委托方id",order = 1)
     private String customerId;
 
     @ApiModelProperty(value = "委托方编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
index 2d3b431..69864f9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
@@ -48,8 +48,8 @@
     private String checkType;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "校验类型",order = 2)
-    @ApiModelProperty(value = "校验类型名称", dataType = "String")
+    @ExcelProperty(value = "检校类型",order = 2)
+    @ApiModelProperty(value = "检校类型名称", dataType = "String")
     private String checkTypeName;
 
     @TableField("price_type")

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 9e8af1f..415b42a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -47,13 +47,14 @@
     <!-- 查询管理状态不是报废，上次检定日期距离和当前时间相差的月份>=检定周期-1(提前30天)-->
     <select id="remindListPage" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            *
+            efa.*, su.NAME AS usePersonName
         FROM
-            equipment_fixed_assets
+            equipment_fixed_assets efa
+        LEFT JOIN sys_user su ON efa.use_person = su.ID
         WHERE
-            is_del = 0
-	    AND manager_state != 4
-	    AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
+            efa.is_del = 0
+	    AND efa.manager_state != 4
+	    AND IFNULL( TIMESTAMPDIFF( MONTH, efa.mesure_date, curdate()), 0 ) >= efa.mesure_cycle - 1
     </select>
 
     <select id="queryVerifiedNum" resultType="int">
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index e88f049..213f913 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -66,7 +66,7 @@
                 and t1.certificate_no like concat('%', #{request.verifierCertificateNo}, '%')
             </if>
             <if test="request.certificateStatus != null  and request.certificateStatus != ''">
-                and t1.certificate_status = #{request.certificateStatus}
+<!--                and t1.certificate_status = #{request.certificateStatus}-->
                 <if test="request.certificateStatus == 0">
                     and NOW() &lt; t1.valid_date
                 </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 418da3c..191c565 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -31,7 +31,7 @@
     private String orderCode;
 
     @ApiModelProperty(value = "委托方id", dataType = "String")
-    @ExcelProperty(value = "委托方id",order = 1)
+//    @ExcelProperty(value = "委托方id",order = 1)
     private String customerId;
 
     @ApiModelProperty(value = "委托方编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
index 2d3b431..69864f9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
@@ -48,8 +48,8 @@
     private String checkType;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "校验类型",order = 2)
-    @ApiModelProperty(value = "校验类型名称", dataType = "String")
+    @ExcelProperty(value = "检校类型",order = 2)
+    @ApiModelProperty(value = "检校类型名称", dataType = "String")
     private String checkTypeName;
 
     @TableField("price_type")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java
index 065bcbd..b2d5c4e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java
@@ -76,16 +76,17 @@
             WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
             approvalMessage.setNoticeId(rootId);
             approvalMessage.setNoticeDeptId(user.getDeptId());
-            approvalMessage.setMessageTitle("审批结果通知");
+            approvalMessage.setMessageTitle("结果通知");
             approvalMessage.setMessageContent(formName);
             approvalMessage.setFormId(formId);
             approvalMessage.setCreateTime(DateUtil.now());
             if (approvalMessageMapper.insert(approvalMessage) < 0) {
                 log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }else {
+                //websocket消息推送
+                WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+                webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
             }
-            //websocket消息推送
-            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
-            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
         }
     }