diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
new file mode 100644
index 0000000..0dc28a0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
new file mode 100644
index 0000000..0dc28a0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
new file mode 100644
index 0000000..1b4acf7
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowServiceImpl extends ServiceImpl<EquipmentBorrowMapper, EquipmentBorrow> implements IEquipmentBorrowService {
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
new file mode 100644
index 0000000..0dc28a0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
new file mode 100644
index 0000000..1b4acf7
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowServiceImpl extends ServiceImpl<EquipmentBorrowMapper, EquipmentBorrow> implements IEquipmentBorrowService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
new file mode 100644
index 0000000..67b62bc
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
@@ -0,0 +1,106 @@
+package com.casic.missiles.service.impl.status;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.equipment.EquipmentInfo;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.mapper.status.EquipmentMaintainMapper;
+import com.casic.missiles.service.equipment.IEquipmentAttachmentService;
+import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
+import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Service
+@RequiredArgsConstructor
+public class EquipmentMaintainServiceImpl extends ServiceImpl<EquipmentMaintainMapper, EquipmentMaintain> implements IEquipmentMaintainService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final ISystemDeptService deptService;
+    private final IEquipmentInfoService equipmentInfoService;
+    private final IEquipmentAttachmentService attachmentService;
+
+    private final ISystemPositionService positionService;
+
+    @Override
+    public void add(EquipmentMaintain maintain) {
+        this.save(maintain);
+    }
+
+    @Override
+    public void update(EquipmentMaintain maintain) {
+        this.updateById(maintain);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public Page<EquipmentMaintain> listPage(Page<EquipmentMaintain> page, EquipmentMaintainQueryForm queryForm) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("e.dept_id");
+
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()),"e.equipment_name",queryForm.getEquipmentName());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getModel()),"e.model",queryForm.getModel());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()),"e.manufacture_no",queryForm.getManufactureNo());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"e.company_id",queryForm.getCompanyId());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(queryForm.getDeptId());
+            deptIds.addAll(deptService.getIdsByPid(queryForm.getDeptId(),null));
+            queryWrapper.in("e.dept_id",deptIds);
+        }
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()),"e.use_position_id",queryForm.getUsePositionId());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getUsePosition()),"e.use_position",queryForm.getUsePosition());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateUserName()),"m.create_user_name",queryForm.getCreateUserName());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCreateTimeStart()),"m.create_time",queryForm.getCreateTimeStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCreateTimeEnd()),"m.create_time",queryForm.getCreateTimeEnd());
+
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(page,dataScope,queryWrapper);
+        for (EquipmentMaintain maintain : list) {
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+        }
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public EquipmentMaintain detail(Long id) {
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("m.id",id);
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(null,null,queryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            EquipmentMaintain maintain = list.get(0);
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+            maintain.setAttachments(attachmentService.selectByEquipment(maintain.getEquipmentId()));
+            return maintain;
+        }
+        return null;
+    }
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
new file mode 100644
index 0000000..0dc28a0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
new file mode 100644
index 0000000..1b4acf7
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowServiceImpl extends ServiceImpl<EquipmentBorrowMapper, EquipmentBorrow> implements IEquipmentBorrowService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
new file mode 100644
index 0000000..67b62bc
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
@@ -0,0 +1,106 @@
+package com.casic.missiles.service.impl.status;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.equipment.EquipmentInfo;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.mapper.status.EquipmentMaintainMapper;
+import com.casic.missiles.service.equipment.IEquipmentAttachmentService;
+import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
+import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Service
+@RequiredArgsConstructor
+public class EquipmentMaintainServiceImpl extends ServiceImpl<EquipmentMaintainMapper, EquipmentMaintain> implements IEquipmentMaintainService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final ISystemDeptService deptService;
+    private final IEquipmentInfoService equipmentInfoService;
+    private final IEquipmentAttachmentService attachmentService;
+
+    private final ISystemPositionService positionService;
+
+    @Override
+    public void add(EquipmentMaintain maintain) {
+        this.save(maintain);
+    }
+
+    @Override
+    public void update(EquipmentMaintain maintain) {
+        this.updateById(maintain);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public Page<EquipmentMaintain> listPage(Page<EquipmentMaintain> page, EquipmentMaintainQueryForm queryForm) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("e.dept_id");
+
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()),"e.equipment_name",queryForm.getEquipmentName());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getModel()),"e.model",queryForm.getModel());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()),"e.manufacture_no",queryForm.getManufactureNo());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"e.company_id",queryForm.getCompanyId());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(queryForm.getDeptId());
+            deptIds.addAll(deptService.getIdsByPid(queryForm.getDeptId(),null));
+            queryWrapper.in("e.dept_id",deptIds);
+        }
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()),"e.use_position_id",queryForm.getUsePositionId());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getUsePosition()),"e.use_position",queryForm.getUsePosition());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateUserName()),"m.create_user_name",queryForm.getCreateUserName());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCreateTimeStart()),"m.create_time",queryForm.getCreateTimeStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCreateTimeEnd()),"m.create_time",queryForm.getCreateTimeEnd());
+
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(page,dataScope,queryWrapper);
+        for (EquipmentMaintain maintain : list) {
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+        }
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public EquipmentMaintain detail(Long id) {
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("m.id",id);
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(null,null,queryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            EquipmentMaintain maintain = list.get(0);
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+            maintain.setAttachments(attachmentService.selectByEquipment(maintain.getEquipmentId()));
+            return maintain;
+        }
+        return null;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
index c12fb0d..cd908f4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
@@ -26,9 +26,11 @@
 import com.casic.missiles.service.status.IEquipmentStatusLogService;
 import com.casic.missiles.service.status.IEquipmentStatusRelationService;
 import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -61,6 +63,7 @@
     private final IEquipmentStatusLogService statusLogService;
     private final ISystemDeptService systemDeptService;
     private final IEquipmentStatusRelationService relationService;
+    private final ISystemPositionService positionService;
 
     @Override
     public Long saveOrUpdateApproval(EquipmentStatusApproval approvalForm) {
@@ -172,6 +175,9 @@
             EquipmentInfo equipmentInfo = equipmentInfoService.getById(approval.getEquipmentId());
             equipmentInfo.setCompanyName(permissionContext.getDeptService().getDeptName(equipmentInfo.getCompanyId()));
             equipmentInfo.setDeptName(permissionContext.getDeptService().getDeptName(equipmentInfo.getDeptId()));
+            if(ObjectUtil.isNotEmpty(equipmentInfo.getUsePositionId())){
+                equipmentInfo.setUsePosition(positionService.getNameById(equipmentInfo.getUsePositionId()));
+            }
             approval.setEquipmentInfo(equipmentInfo);
         }
         return approval;

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
new file mode 100644
index 0000000..0dc28a0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
new file mode 100644
index 0000000..1b4acf7
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowServiceImpl extends ServiceImpl<EquipmentBorrowMapper, EquipmentBorrow> implements IEquipmentBorrowService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
new file mode 100644
index 0000000..67b62bc
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
@@ -0,0 +1,106 @@
+package com.casic.missiles.service.impl.status;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.equipment.EquipmentInfo;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.mapper.status.EquipmentMaintainMapper;
+import com.casic.missiles.service.equipment.IEquipmentAttachmentService;
+import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
+import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Service
+@RequiredArgsConstructor
+public class EquipmentMaintainServiceImpl extends ServiceImpl<EquipmentMaintainMapper, EquipmentMaintain> implements IEquipmentMaintainService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final ISystemDeptService deptService;
+    private final IEquipmentInfoService equipmentInfoService;
+    private final IEquipmentAttachmentService attachmentService;
+
+    private final ISystemPositionService positionService;
+
+    @Override
+    public void add(EquipmentMaintain maintain) {
+        this.save(maintain);
+    }
+
+    @Override
+    public void update(EquipmentMaintain maintain) {
+        this.updateById(maintain);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public Page<EquipmentMaintain> listPage(Page<EquipmentMaintain> page, EquipmentMaintainQueryForm queryForm) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("e.dept_id");
+
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()),"e.equipment_name",queryForm.getEquipmentName());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getModel()),"e.model",queryForm.getModel());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()),"e.manufacture_no",queryForm.getManufactureNo());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"e.company_id",queryForm.getCompanyId());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(queryForm.getDeptId());
+            deptIds.addAll(deptService.getIdsByPid(queryForm.getDeptId(),null));
+            queryWrapper.in("e.dept_id",deptIds);
+        }
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()),"e.use_position_id",queryForm.getUsePositionId());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getUsePosition()),"e.use_position",queryForm.getUsePosition());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateUserName()),"m.create_user_name",queryForm.getCreateUserName());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCreateTimeStart()),"m.create_time",queryForm.getCreateTimeStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCreateTimeEnd()),"m.create_time",queryForm.getCreateTimeEnd());
+
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(page,dataScope,queryWrapper);
+        for (EquipmentMaintain maintain : list) {
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+        }
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public EquipmentMaintain detail(Long id) {
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("m.id",id);
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(null,null,queryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            EquipmentMaintain maintain = list.get(0);
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+            maintain.setAttachments(attachmentService.selectByEquipment(maintain.getEquipmentId()));
+            return maintain;
+        }
+        return null;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
index c12fb0d..cd908f4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
@@ -26,9 +26,11 @@
 import com.casic.missiles.service.status.IEquipmentStatusLogService;
 import com.casic.missiles.service.status.IEquipmentStatusRelationService;
 import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -61,6 +63,7 @@
     private final IEquipmentStatusLogService statusLogService;
     private final ISystemDeptService systemDeptService;
     private final IEquipmentStatusRelationService relationService;
+    private final ISystemPositionService positionService;
 
     @Override
     public Long saveOrUpdateApproval(EquipmentStatusApproval approvalForm) {
@@ -172,6 +175,9 @@
             EquipmentInfo equipmentInfo = equipmentInfoService.getById(approval.getEquipmentId());
             equipmentInfo.setCompanyName(permissionContext.getDeptService().getDeptName(equipmentInfo.getCompanyId()));
             equipmentInfo.setDeptName(permissionContext.getDeptService().getDeptName(equipmentInfo.getDeptId()));
+            if(ObjectUtil.isNotEmpty(equipmentInfo.getUsePositionId())){
+                equipmentInfo.setUsePosition(positionService.getNameById(equipmentInfo.getUsePositionId()));
+            }
             approval.setEquipmentInfo(equipmentInfo);
         }
         return approval;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
index 24df7d7..6fac6e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
@@ -21,4 +21,6 @@
 
     void questionnaireSubmit(BizResourceCustomerQuestionnaire questionnaire);
 
+    ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire);
+
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
new file mode 100644
index 0000000..0dc28a0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
new file mode 100644
index 0000000..1b4acf7
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowServiceImpl extends ServiceImpl<EquipmentBorrowMapper, EquipmentBorrow> implements IEquipmentBorrowService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
new file mode 100644
index 0000000..67b62bc
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
@@ -0,0 +1,106 @@
+package com.casic.missiles.service.impl.status;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.equipment.EquipmentInfo;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.mapper.status.EquipmentMaintainMapper;
+import com.casic.missiles.service.equipment.IEquipmentAttachmentService;
+import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
+import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Service
+@RequiredArgsConstructor
+public class EquipmentMaintainServiceImpl extends ServiceImpl<EquipmentMaintainMapper, EquipmentMaintain> implements IEquipmentMaintainService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final ISystemDeptService deptService;
+    private final IEquipmentInfoService equipmentInfoService;
+    private final IEquipmentAttachmentService attachmentService;
+
+    private final ISystemPositionService positionService;
+
+    @Override
+    public void add(EquipmentMaintain maintain) {
+        this.save(maintain);
+    }
+
+    @Override
+    public void update(EquipmentMaintain maintain) {
+        this.updateById(maintain);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public Page<EquipmentMaintain> listPage(Page<EquipmentMaintain> page, EquipmentMaintainQueryForm queryForm) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("e.dept_id");
+
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()),"e.equipment_name",queryForm.getEquipmentName());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getModel()),"e.model",queryForm.getModel());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()),"e.manufacture_no",queryForm.getManufactureNo());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"e.company_id",queryForm.getCompanyId());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(queryForm.getDeptId());
+            deptIds.addAll(deptService.getIdsByPid(queryForm.getDeptId(),null));
+            queryWrapper.in("e.dept_id",deptIds);
+        }
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()),"e.use_position_id",queryForm.getUsePositionId());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getUsePosition()),"e.use_position",queryForm.getUsePosition());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateUserName()),"m.create_user_name",queryForm.getCreateUserName());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCreateTimeStart()),"m.create_time",queryForm.getCreateTimeStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCreateTimeEnd()),"m.create_time",queryForm.getCreateTimeEnd());
+
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(page,dataScope,queryWrapper);
+        for (EquipmentMaintain maintain : list) {
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+        }
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public EquipmentMaintain detail(Long id) {
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("m.id",id);
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(null,null,queryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            EquipmentMaintain maintain = list.get(0);
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+            maintain.setAttachments(attachmentService.selectByEquipment(maintain.getEquipmentId()));
+            return maintain;
+        }
+        return null;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
index c12fb0d..cd908f4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
@@ -26,9 +26,11 @@
 import com.casic.missiles.service.status.IEquipmentStatusLogService;
 import com.casic.missiles.service.status.IEquipmentStatusRelationService;
 import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -61,6 +63,7 @@
     private final IEquipmentStatusLogService statusLogService;
     private final ISystemDeptService systemDeptService;
     private final IEquipmentStatusRelationService relationService;
+    private final ISystemPositionService positionService;
 
     @Override
     public Long saveOrUpdateApproval(EquipmentStatusApproval approvalForm) {
@@ -172,6 +175,9 @@
             EquipmentInfo equipmentInfo = equipmentInfoService.getById(approval.getEquipmentId());
             equipmentInfo.setCompanyName(permissionContext.getDeptService().getDeptName(equipmentInfo.getCompanyId()));
             equipmentInfo.setDeptName(permissionContext.getDeptService().getDeptName(equipmentInfo.getDeptId()));
+            if(ObjectUtil.isNotEmpty(equipmentInfo.getUsePositionId())){
+                equipmentInfo.setUsePosition(positionService.getNameById(equipmentInfo.getUsePositionId()));
+            }
             approval.setEquipmentInfo(equipmentInfo);
         }
         return approval;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
index 24df7d7..6fac6e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
@@ -21,4 +21,6 @@
 
     void questionnaireSubmit(BizResourceCustomerQuestionnaire questionnaire);
 
+    ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java
new file mode 100644
index 0000000..9a52e3b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.service.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.dto.resource.SuggestFormSaveResponse;
+import com.casic.missiles.model.business.EqptBusinessOrderInfo;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface IEqptResourceCustomerSuggestFormService extends ICommonApprovalService<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
+
+    Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm);
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
new file mode 100644
index 0000000..0dc28a0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
new file mode 100644
index 0000000..1b4acf7
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowServiceImpl extends ServiceImpl<EquipmentBorrowMapper, EquipmentBorrow> implements IEquipmentBorrowService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
new file mode 100644
index 0000000..67b62bc
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
@@ -0,0 +1,106 @@
+package com.casic.missiles.service.impl.status;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.equipment.EquipmentInfo;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.mapper.status.EquipmentMaintainMapper;
+import com.casic.missiles.service.equipment.IEquipmentAttachmentService;
+import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
+import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Service
+@RequiredArgsConstructor
+public class EquipmentMaintainServiceImpl extends ServiceImpl<EquipmentMaintainMapper, EquipmentMaintain> implements IEquipmentMaintainService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final ISystemDeptService deptService;
+    private final IEquipmentInfoService equipmentInfoService;
+    private final IEquipmentAttachmentService attachmentService;
+
+    private final ISystemPositionService positionService;
+
+    @Override
+    public void add(EquipmentMaintain maintain) {
+        this.save(maintain);
+    }
+
+    @Override
+    public void update(EquipmentMaintain maintain) {
+        this.updateById(maintain);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public Page<EquipmentMaintain> listPage(Page<EquipmentMaintain> page, EquipmentMaintainQueryForm queryForm) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("e.dept_id");
+
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()),"e.equipment_name",queryForm.getEquipmentName());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getModel()),"e.model",queryForm.getModel());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()),"e.manufacture_no",queryForm.getManufactureNo());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"e.company_id",queryForm.getCompanyId());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(queryForm.getDeptId());
+            deptIds.addAll(deptService.getIdsByPid(queryForm.getDeptId(),null));
+            queryWrapper.in("e.dept_id",deptIds);
+        }
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()),"e.use_position_id",queryForm.getUsePositionId());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getUsePosition()),"e.use_position",queryForm.getUsePosition());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateUserName()),"m.create_user_name",queryForm.getCreateUserName());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCreateTimeStart()),"m.create_time",queryForm.getCreateTimeStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCreateTimeEnd()),"m.create_time",queryForm.getCreateTimeEnd());
+
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(page,dataScope,queryWrapper);
+        for (EquipmentMaintain maintain : list) {
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+        }
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public EquipmentMaintain detail(Long id) {
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("m.id",id);
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(null,null,queryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            EquipmentMaintain maintain = list.get(0);
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+            maintain.setAttachments(attachmentService.selectByEquipment(maintain.getEquipmentId()));
+            return maintain;
+        }
+        return null;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
index c12fb0d..cd908f4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
@@ -26,9 +26,11 @@
 import com.casic.missiles.service.status.IEquipmentStatusLogService;
 import com.casic.missiles.service.status.IEquipmentStatusRelationService;
 import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -61,6 +63,7 @@
     private final IEquipmentStatusLogService statusLogService;
     private final ISystemDeptService systemDeptService;
     private final IEquipmentStatusRelationService relationService;
+    private final ISystemPositionService positionService;
 
     @Override
     public Long saveOrUpdateApproval(EquipmentStatusApproval approvalForm) {
@@ -172,6 +175,9 @@
             EquipmentInfo equipmentInfo = equipmentInfoService.getById(approval.getEquipmentId());
             equipmentInfo.setCompanyName(permissionContext.getDeptService().getDeptName(equipmentInfo.getCompanyId()));
             equipmentInfo.setDeptName(permissionContext.getDeptService().getDeptName(equipmentInfo.getDeptId()));
+            if(ObjectUtil.isNotEmpty(equipmentInfo.getUsePositionId())){
+                equipmentInfo.setUsePosition(positionService.getNameById(equipmentInfo.getUsePositionId()));
+            }
             approval.setEquipmentInfo(equipmentInfo);
         }
         return approval;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
index 24df7d7..6fac6e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
@@ -21,4 +21,6 @@
 
     void questionnaireSubmit(BizResourceCustomerQuestionnaire questionnaire);
 
+    ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java
new file mode 100644
index 0000000..9a52e3b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.service.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.dto.resource.SuggestFormSaveResponse;
+import com.casic.missiles.model.business.EqptBusinessOrderInfo;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface IEqptResourceCustomerSuggestFormService extends ICommonApprovalService<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
+
+    Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
new file mode 100644
index 0000000..a59b3ee
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.service.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface IEquipmentBorrowRelationService extends IService<EquipmentBorrowRelation> {
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
new file mode 100644
index 0000000..0dc28a0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
new file mode 100644
index 0000000..1b4acf7
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowServiceImpl extends ServiceImpl<EquipmentBorrowMapper, EquipmentBorrow> implements IEquipmentBorrowService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
new file mode 100644
index 0000000..67b62bc
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
@@ -0,0 +1,106 @@
+package com.casic.missiles.service.impl.status;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.equipment.EquipmentInfo;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.mapper.status.EquipmentMaintainMapper;
+import com.casic.missiles.service.equipment.IEquipmentAttachmentService;
+import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
+import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Service
+@RequiredArgsConstructor
+public class EquipmentMaintainServiceImpl extends ServiceImpl<EquipmentMaintainMapper, EquipmentMaintain> implements IEquipmentMaintainService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final ISystemDeptService deptService;
+    private final IEquipmentInfoService equipmentInfoService;
+    private final IEquipmentAttachmentService attachmentService;
+
+    private final ISystemPositionService positionService;
+
+    @Override
+    public void add(EquipmentMaintain maintain) {
+        this.save(maintain);
+    }
+
+    @Override
+    public void update(EquipmentMaintain maintain) {
+        this.updateById(maintain);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public Page<EquipmentMaintain> listPage(Page<EquipmentMaintain> page, EquipmentMaintainQueryForm queryForm) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("e.dept_id");
+
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()),"e.equipment_name",queryForm.getEquipmentName());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getModel()),"e.model",queryForm.getModel());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()),"e.manufacture_no",queryForm.getManufactureNo());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"e.company_id",queryForm.getCompanyId());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(queryForm.getDeptId());
+            deptIds.addAll(deptService.getIdsByPid(queryForm.getDeptId(),null));
+            queryWrapper.in("e.dept_id",deptIds);
+        }
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()),"e.use_position_id",queryForm.getUsePositionId());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getUsePosition()),"e.use_position",queryForm.getUsePosition());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateUserName()),"m.create_user_name",queryForm.getCreateUserName());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCreateTimeStart()),"m.create_time",queryForm.getCreateTimeStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCreateTimeEnd()),"m.create_time",queryForm.getCreateTimeEnd());
+
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(page,dataScope,queryWrapper);
+        for (EquipmentMaintain maintain : list) {
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+        }
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public EquipmentMaintain detail(Long id) {
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("m.id",id);
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(null,null,queryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            EquipmentMaintain maintain = list.get(0);
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+            maintain.setAttachments(attachmentService.selectByEquipment(maintain.getEquipmentId()));
+            return maintain;
+        }
+        return null;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
index c12fb0d..cd908f4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
@@ -26,9 +26,11 @@
 import com.casic.missiles.service.status.IEquipmentStatusLogService;
 import com.casic.missiles.service.status.IEquipmentStatusRelationService;
 import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -61,6 +63,7 @@
     private final IEquipmentStatusLogService statusLogService;
     private final ISystemDeptService systemDeptService;
     private final IEquipmentStatusRelationService relationService;
+    private final ISystemPositionService positionService;
 
     @Override
     public Long saveOrUpdateApproval(EquipmentStatusApproval approvalForm) {
@@ -172,6 +175,9 @@
             EquipmentInfo equipmentInfo = equipmentInfoService.getById(approval.getEquipmentId());
             equipmentInfo.setCompanyName(permissionContext.getDeptService().getDeptName(equipmentInfo.getCompanyId()));
             equipmentInfo.setDeptName(permissionContext.getDeptService().getDeptName(equipmentInfo.getDeptId()));
+            if(ObjectUtil.isNotEmpty(equipmentInfo.getUsePositionId())){
+                equipmentInfo.setUsePosition(positionService.getNameById(equipmentInfo.getUsePositionId()));
+            }
             approval.setEquipmentInfo(equipmentInfo);
         }
         return approval;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
index 24df7d7..6fac6e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
@@ -21,4 +21,6 @@
 
     void questionnaireSubmit(BizResourceCustomerQuestionnaire questionnaire);
 
+    ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java
new file mode 100644
index 0000000..9a52e3b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.service.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.dto.resource.SuggestFormSaveResponse;
+import com.casic.missiles.model.business.EqptBusinessOrderInfo;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface IEqptResourceCustomerSuggestFormService extends ICommonApprovalService<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
+
+    Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
new file mode 100644
index 0000000..a59b3ee
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.service.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface IEquipmentBorrowRelationService extends IService<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
new file mode 100644
index 0000000..0a88522
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.service.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface IEquipmentBorrowService extends IService<EquipmentBorrow> {
+
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 7a772ba..510194d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -21,6 +21,8 @@
 
     String SUBCONTRACT_ORDER_BEAN_NAME = "subcontractOrderBean";
 
+    String SUGGEST_FORM_BEAN_NAME = "suggestFormBean";
+
 //    String SUPPORT_BEAN_NAME = "equipmentSupportBean";
 //
 //    String MANAGING_BEAN_NAME = "equipmentManagingBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 0b4f0bd..b238263 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -17,7 +17,10 @@
     SUBCONTRACT_REVIEW_APPROVAL(SUBCONTRACT_REVIEW_BEAN_NAME,""),
     SUBCONTRACT_ORDER_APPROVAL(SUBCONTRACT_ORDER_BEAN_NAME,""),
 
-//    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
+    SUGGEST_FORM_APPROVAL(SUGGEST_FORM_BEAN_NAME,""),
+
+
+    //    EQUIPMENT_APPLY_STOP(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.STOP),
 //    EQUIPMENT_APPLY_REVOKE(APPLY_BEAN_NAME, EquipmentApplyProcessEnum.REVOKE),
 //    EQUIPMENT_SUPPORT_STATUS(SUPPORT_BEAN_NAME, ""),
 //    DEVICE_MANAGING_IDLE(MANAGING_BEAN_NAME, EquipmentApplyProcessEnum.IDLE),
@@ -51,6 +54,8 @@
             put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
             put(ApplyFromIdEnum.SUBCONTRACT_ORDER_APPROVAL.getCode(), SUBCONTRACT_ORDER_APPROVAL);
+            // 计量业务
+            put(ApplyFromIdEnum.CUSTOMER_SUGGEST_FORM_APPROVAL.getCode(),SUGGEST_FORM_APPROVAL );
 
 //            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
 //            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index a1b4576..34c25c7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -20,7 +20,7 @@
     /**
      * 属于计量业务系统
      */
-    CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb", "计量业务", "委托方意见登记表审批"),
+    CUSTOMER_SUGGEST_FORM_APPROVAL("jlywwtfyjdjb", "计量业务", "委托方意见登记表审批"),
     ;
 
     private String code;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
index 448ddf8..d3a0797 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NoGeneratorUtil.java
@@ -19,9 +19,9 @@
         //年号
         int yearNo = DateUtil.thisYear();
         StringBuilder builder = new StringBuilder();
-        builder.append(fileNo);
-        builder.append(labNo);
-        builder.append(recordTypeNo);
+        builder.append(fileNo).append("-");
+        builder.append(labNo).append("-");
+        builder.append(recordTypeNo).append("-");
         if(StringUtils.isNotEmpty(groupNo)){
             builder.append(groupNo);
         }
@@ -32,9 +32,10 @@
             count = new AtomicLong(0);
             builder.append("00").append(count.incrementAndGet());
         }else{
-            builder.append(count.incrementAndGet());
+            String format = String.format("%03d", count.incrementAndGet());
+            builder.append(format);
         }
-        return builder.toString();
+        return String.valueOf(builder);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
new file mode 100644
index 0000000..4c74bbe
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EqptResourceCustomerSuggestFormMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface EqptResourceCustomerSuggestFormMapper extends BaseMapper<EqptResourceCustomerSuggestForm> {
+
+    Long selectMaxFormNo();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
new file mode 100644
index 0000000..ac2e80c
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowMapper extends BaseMapper<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
new file mode 100644
index 0000000..05a33d3
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface EquipmentBorrowRelationMapper extends BaseMapper<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
new file mode 100644
index 0000000..75b6a4a
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentMaintainMapper.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.mapper.status;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface EquipmentMaintainMapper extends BaseMapper<EquipmentMaintain> {
+
+    List<EquipmentMaintain> selectScopePage(@Param("page") Page<EquipmentMaintain> page,
+                                            @Param("scope")DataScope dataScope,
+                                            @Param("ew")QueryWrapper<EquipmentMaintain> ew);
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
index eb18a2a..9fa669c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceNoticeMapper.xml
@@ -49,12 +49,18 @@
         <if test="request != null and request.noticeNo != null and request.noticeNo !=''">
             and notice_no like concat('%',#{request.noticeNo},'%')
         </if>
+        <if test="request != null and request.noticeName != null and request.noticeName !=''">
+            and notice_name like concat('%',#{request.noticeName},'%')
+        </if>
         <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
         <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
+        <if test="request != null and request.outsourceItem != null and request.outsourceItem !=''">
+            and outsource_item like concat('%',#{request.outsourceItem},'%')
+        </if>
         <if test="request != null and request.applicantName != null and request.applicantName !=''">
             and create_user_name like concat('%',#{request.applicantName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
new file mode 100644
index 0000000..78da7c3
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EqptResourceCustomerSuggestFormMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm">
+        <id column="id" property="id" />
+        <result column="customer_id" property="customerId" />
+        <result column="customer_name" property="customerName" />
+        <result column="customer_dept_id" property="customerDeptId" />
+        <result column="customer_dept_name" property="customerDeptName" />
+        <result column="form_name" property="formName" />
+        <result column="form_no" property="formNo" />
+        <result column="lab_code" property="labCode" />
+        <result column="appeal_user_id" property="appealUserId" />
+        <result column="appeal_user_name" property="appealUserName" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="suggest_content" property="suggestContent" />
+        <result column="remark" property="remark" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxFormNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(form_no, 3)), 0) from eqpt_resource_customer_suggest_form
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
new file mode 100644
index 0000000..d024208
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrow">
+        <id column="id" property="id" />
+        <result column="approval_no" property="approvalNo" />
+        <result column="company_id" property="companyId" />
+        <result column="dept_id" property="deptId" />
+        <result column="approval_user_id" property="approvalUserId" />
+        <result column="approval_user_name" property="approvalUserName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="borrow_dept_id" property="borrowDeptId" />
+        <result column="borrow_reason" property="borrowReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="process_id" property="processId" />
+        <result column="approval_status" property="approvalStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
new file mode 100644
index 0000000..c950f96
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentBorrowRelation">
+        <id column="id" property="id" />
+        <result column="borrow_id" property="borrowId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="return_date" property="returnDate" />
+        <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
new file mode 100644
index 0000000..0da5f20
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentMaintainMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.status.EquipmentMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.status.EquipmentMaintain">
+        <id column="id" property="id" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="fault_description" property="faultDescription" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="remark" property="remark" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_id, fault_description, maintain_content, remark, create_user_id, create_user_name, create_time, update_time
+    </sql>
+
+    <select id="selectScopePage" resultType="com.casic.missiles.model.status.EquipmentMaintain">
+        SELECT
+            m.id as id,
+            m.equipment_id as equipmentId,
+            e.equipment_no as equipmentNo,
+            e.equipment_name as equipmentName,
+            e.model as model,
+            e.manufacture_no as manufactureNo,
+            e.manufacturer as manufacturer,
+            e.company_id as companyId,
+            e.dept_id as deptId,
+            e.use_position as usePosition,
+            e.use_position_id as usePositionId,
+            m.fault_description as faultDescription,
+            m.maintain_content as maintainContent,
+            m.remark as remark,
+            m.create_user_id as createUserId,
+            m.create_user_name as createUserName,
+            m.create_time as createTime,
+            m.update_time as updateTime
+        from eqpt_equipment_maintain m
+        LEFT JOIN eqpt_equipment_info_view e on m.equipment_id = e.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
index 09548e6..73e094d 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml
@@ -47,6 +47,7 @@
             info.manufacturer as manufacturer,
             info.company_id as companyId,
             info.dept_id as deptId,
+            info.use_position_id as usePositionId,
             info.use_position as usePosition,
             approval.process_id as processId,
             (case when approval.approval_type = '5'
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
index 388881c..14e80d1 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java
@@ -58,5 +58,12 @@
         return ReturnUtil.success();
     }
 
+    @ApiOperation("委托方满意度调查表新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) {
+        return questionnaireService.questionnaireAdd(questionnaire);
+    }
+
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index c574ef7..d7f394b 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.controller.CommonApprovalController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -15,7 +16,10 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +42,17 @@
 @Api(tags = "委托方管理-委托方意见登记表")
 @RestController
 @RequestMapping("/resource/customer/suggestForm")
-public class BizResourceCustomerSuggestFormController extends ExportController {
+public class BizResourceCustomerSuggestFormController extends CommonApprovalController<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
     @Autowired
-    private IBizResourceCustomerSuggestFormService suggestFormService;
+    private IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    @Autowired
+    private IEqptResourceCustomerSuggestFormService service;
 
-    @ApiOperation("委托方意见登记表列表及详情中基础信息（分页）")
+    public BizResourceCustomerSuggestFormController(IEqptResourceCustomerSuggestFormService service) {
+        super(service);
+    }
+
+    @ApiOperation("全部标签-列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<BizResourceCustomerSuggestForm>> approvalListPage(@RequestBody @Valid SuggestFormApprovalListRequest request, BindingResult bindingResult) throws Exception {
@@ -50,7 +60,7 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceCustomerSuggestForm> page = PageFactory.defaultPage();
-        Page<BizResourceCustomerSuggestForm> responsePage = suggestFormService.listPage(page, request);
+        Page<BizResourceCustomerSuggestForm> responsePage = bizSuggestFormService.listPage(page, request);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
@@ -58,21 +68,11 @@
     @ApiOperation("委托方意见登记表新建")
     @PostMapping("/add")
     @ResponseBody
-    public ReturnDTO draftUpdate(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) {
+    public ReturnDTO draftUpdate(@RequestBody @Valid EqptResourceCustomerSuggestForm request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return suggestFormService.addSuggestForm(request);
-    }
-
-    @ApiOperation("委托方意见登记表删除")
-    @PostMapping("/delete")
-    @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if(bindingResult.hasErrors()){
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        return suggestFormService.approvalDelete(request);
+        return ReturnUtil.success(service.saveOrUpdateApproval(request));
     }
 
 }
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
new file mode 100644
index 0000000..f767d3a
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentMaintainController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 前端控制器
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Api(tags = "故障维修接口")
+@Slf4j
+@RestController
+@RequestMapping("/maintain")
+@RequiredArgsConstructor
+public class EquipmentMaintainController extends BaseController {
+
+    private final IEquipmentMaintainService maintainService;
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ReturnDTO add(@RequestBody EquipmentMaintain maintain) {
+        maintainService.add(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("update")
+    public ReturnDTO update(@RequestBody EquipmentMaintain maintain) {
+        maintainService.update(maintain);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delete")
+    public ReturnDTO delete(Long id) {
+        maintainService.delete(id);
+        return ReturnUtil.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("detail")
+    public ReturnDTO<EquipmentMaintain> detail(Long id) {
+        return ReturnUtil.success(maintainService.detail(id));
+    }
+
+    @ApiOperation("分页列表")
+    @PostMapping("listPage")
+    public ReturnDTO<EquipmentMaintain> listPage(@RequestBody EquipmentMaintainQueryForm queryForm) {
+        Page<EquipmentMaintain> page = PageFactory.defaultPage();
+        page = maintainService.listPage(page, queryForm);
+        return ReturnUtil.success(super.packForBT(page));
+    }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index d21c296..3725b9b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -4,13 +4,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: Casic203
+    password: Casic203!
   redis:
     host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    port: 21903
+    password: ew5T4K3#203
     database: 1
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index f2606c8..bc6394c 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -122,7 +122,7 @@
     #作者
     author: zhangyingjie
     #待生成对象表名
-    table-name: eqpt_equipment_status_relation
+    table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation
     prefix: eqpt_
 
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
index 48c1b9f..288d0fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceNoticeApprovalListRequest.java
@@ -16,12 +16,18 @@
     @ApiModelProperty(value = "通知书编号", dataType = "String")
     private String noticeNo;
 
+    @ApiModelProperty(value = "通知书名称", dataType = "String")
+    private String noticeName;
+
     @ApiModelProperty(value = "受检单位名称", dataType = "String")
     private String customerName;
 
     @ApiModelProperty(value = "分包方名称", dataType = "String")
     private String outsourcerName;
 
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    private String outsourceItem;
+
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applicantName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
index 58939cf..fbeab20 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerResultReviewNoticeListRequest.java
@@ -14,10 +14,17 @@
 public class CustomerResultReviewNoticeListRequest {
     @ApiModelProperty(value = "通知单编号", dataType = "String")
     private String noticeNo;
+    @ApiModelProperty(value = "通知单名称", dataType = "String")
+    private String noticeName;
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "创建时间开始", dataType = "String")
+    private String noticeDateStart;
+    @ApiModelProperty(value = "创建时间结束", dataType = "String")
+    private String noticeDateEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
index b692d95..e108ebd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/ExamineFormApprovalListRequest.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.dto.resource;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.dto.BaseApprovalListRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,4 +26,8 @@
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "测试、校准或检定项目", dataType = "String")
+    private String measureItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
index 45c6aa9..56b5906 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/SuggestFormApprovalListRequest.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.dto.resource;
 
 import com.casic.missiles.dto.BaseApprovalListRequest;
+import com.casic.missiles.dto.BaseQueryForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,17 +13,23 @@
  */
 @ApiModel
 @Data
-public class SuggestFormApprovalListRequest {
+public class SuggestFormApprovalListRequest extends BaseQueryForm {
     @ApiModelProperty(value = "表单编号", dataType = "String")
     private String formNo;
     @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     private String customerName;
+    @ApiModelProperty(value = "意见反馈单位id", dataType = "Long")
+    private Long customerId;
     @ApiModelProperty(value = "意见反馈部门", dataType = "String")
     private String customerDeptName;
+    @ApiModelProperty(value = "意见反馈部门id", dataType = "Long")
+    private Long customerDeptId;
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUserName;
     @ApiModelProperty(value = "创建时间开始", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建时间结束", dataType = "String")
     private String createTimeEnd;
+    @ApiModelProperty(value = "处置情况", dataType = "String")
+    private String handleStatus;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
new file mode 100644
index 0000000..107c3de
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentMaintainQueryForm.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.dto.status;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EquipmentMaintainQueryForm {
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "所在单位id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "使用部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    private Long usePositionId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建开始时间")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "创建结束时间")
+    private String createTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
index 0e4605f..1004bdf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java
@@ -99,6 +99,10 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @ExcelProperty(value = "分包项目", order = 5)
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("outsource_itme")
+    private String outsourceItem;
     /**
      * 分包设备名字
      */
@@ -116,7 +120,7 @@
     /**
      * 申请人名字(后台自动填为创建人)
      */
-    @ExcelProperty(value = "申请人", order = 5)
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -168,7 +172,7 @@
     /**
      * 创建时间(申请时间)
      */
-    @ExcelProperty(value = "申请时间", order = 6)
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
index fcd6650..f40a621 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java
@@ -35,7 +35,7 @@
      * 委托方id
      */
     @NotNull(message = "委托方id不能为空")
-    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @ApiModelProperty(value = "委托方id，当前用户单位id", dataType = "Long")
     @TableField("customer_id")
     private Long customerId;
 
@@ -92,7 +92,7 @@
     /**
      * 填写人id
      */
-    @ApiModelProperty(value = "填写人id（发送通知接口该字段必传，新建接口该参数不用传）", dataType = "Long")
+    @ApiModelProperty(value = "填写人id", dataType = "Long")
     @TableField("writer_id")
     private Long writerId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
new file mode 100644
index 0000000..cf8510c
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java
@@ -0,0 +1,189 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@ApiModel
+@Data
+@TableName("eqpt_resource_customer_suggest_form")
+public class EqptResourceCustomerSuggestForm extends CommonApproval implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 委托方id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方id，委托方表中的deptId", dataType = "Long")
+    @TableField("customer_id")
+    private Long customerId;
+
+    /**
+     * 委托方名称
+     */
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 委托方意见反馈部门id
+     */
+    @NotNull(message = "委托方id不能为空")
+    @ApiModelProperty(value = "委托方意见反馈部门id", dataType = "Long")
+    @TableField("customer_dept_id")
+    private Long customerDeptId;
+
+    /**
+     * 委托方意见反馈部门名称
+     */
+    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @TableField("customer_dept_name")
+    private String customerDeptName;
+
+    /**
+     * 表单名称
+     */
+    @ApiModelProperty(value = "表单名称", dataType = "String")
+    @TableField("form_name")
+    private String formName;
+
+    /**
+     * 表单编号
+     */
+    @ApiModelProperty(value = "表单编号", dataType = "String")
+    @TableField("form_no")
+    private String formNo;
+
+//    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE,needValid = false)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 申诉人id
+     */
+    @ApiModelProperty(value = "申诉人id(不传该字段则申诉人名字字段必传)", dataType = "Long")
+    @TableField("appeal_user_id")
+    private Long appealUserId;
+
+    /**
+     * 申诉人名字
+     */
+    @ApiModelProperty(value = "申诉人名字", dataType = "String")
+    @TableField("appeal_user_name")
+    private String appealUserName;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 意见内容
+     */
+    @ApiModelProperty(value = "意见内容", dataType = "String")
+    @TableField("suggest_content")
+    private String suggestContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("（受检系统）审核人id")
+    @TableField("approve_user_id")
+    private Long approveUserId;
+
+    @ApiModelProperty("受检系统）审核人姓名")
+    @TableField("approve_user_name")
+    private String approveUserName;
+
+    @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）")
+    @TableField("handle_status")
+    private String handleStatus;
+
+    @ApiModelProperty("处置情况名称")
+    @TableField(exist = false)
+    private String handleStatusName;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
new file mode 100644
index 0000000..0d0f22b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -0,0 +1,105 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow")
+public class EquipmentBorrow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 申请编号
+     */
+    @TableField("approval_no")
+    private String approvalNo;
+
+    /**
+     * 所在单位
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 使用部门
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 申请人id
+     */
+    @TableField("approval_user_id")
+    private Long approvalUserId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("approval_user_name")
+    private String approvalUserName;
+
+    /**
+     * 申请时间
+     */
+    @TableField("approval_time")
+    private LocalDateTime approvalTime;
+
+    /**
+     * 借用部门
+     */
+    @TableField("borrow_dept_id")
+    private Long borrowDeptId;
+
+    /**
+     * 借用原因
+     */
+    @TableField("borrow_reason")
+    private String borrowReason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 流程实例id
+     */
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 审批状态
+     */
+    @TableField("approval_status")
+    private String approvalStatus;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
new file mode 100644
index 0000000..f4087e1
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_borrow_relation")
+public class EquipmentBorrowRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId("id")
+    private Long id;
+
+    /**
+     * 借用申请id
+     */
+    @TableField("borrow_id")
+    private Long borrowId;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 归还日期
+     */
+    @TableField("return_date")
+    private LocalDateTime returnDate;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
new file mode 100644
index 0000000..54e958a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentMaintain.java
@@ -0,0 +1,144 @@
+package com.casic.missiles.model.status;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.model.equipment.EquipmentAttachment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Getter
+@Setter
+@TableName("eqpt_equipment_maintain")
+public class EquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备id")
+    @TableField("equipment_id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField(exist = false)
+    private String model;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String manufactureNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    @TableField(exist = false)
+    private String manufacturer;
+
+    @ApiModelProperty(value = "所在单位id")
+    @TableField(exist = false)
+    private Long companyId;
+
+    @ApiModelProperty(value = "所在单位名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "使用部门id")
+    @TableField(exist = false)
+    private Long deptId;
+
+    @ApiModelProperty(value = "使用部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty(value = "使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("主附件信息列表")
+    @TableField(exist = false)
+    private List<EquipmentAttachment> attachments;
+
+    /**
+     * 故障描述
+     */
+    @ApiModelProperty("故障描述")
+    @TableField("fault_description")
+    private String faultDescription;
+
+    /**
+     * 维修内容
+     */
+    @ApiModelProperty("维修内容")
+    @TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
index e40a8cd..13c8a21 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusApproval.java
@@ -205,6 +205,14 @@
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty("使用岗位id")
+    @TableField(exist = false)
+    private Long usePositionId;
+
+    @ApiModelProperty("使用岗位名称")
+    @TableField(exist = false)
+    private String usePosition;
+
     @ApiModelProperty("任务id")
     @TableField(exist = false)
     private String taskId;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index cef0103..d8c845c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -41,8 +41,8 @@
     private final AbstractPermissionContext permissionContext;
     private final ISystemDeptService systemDeptService;
 
-    private final String PUBLISH_SCOPE_ALL = "0";
-    private final String PUBLISH_SCOPE_INSIDE = "1";
+    private final String PUBLISH_SCOPE_ALL = "1";
+    private final String PUBLISH_SCOPE_INSIDE = "2";
 
     @Override
     public void addFile(EqptFile file) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 6b03d8b..3abc061 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -76,6 +76,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(request.getFormNo()),"form_no",request.getFormNo());
         queryWrapper.like(StrUtil.isNotEmpty(request.getLabCode()),"lab_code",request.getLabCode());
         queryWrapper.like(StrUtil.isNotEmpty(request.getGroupCode()),"group_code",request.getGroupCode());
+        queryWrapper.like(StrUtil.isNotEmpty(request.getMeasureItem()),"measure_item",request.getMeasureItem());
         queryWrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()),"create_user_name",request.getCreateUserName());
         queryWrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
index 722bfa2..f5c8c94 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -79,4 +80,24 @@
         this.updateById(questionnaire);
     }
 
+    @Override
+    public ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire) {
+        //生成编号
+        String labCode = questionnaire.getLabCode();
+        Long maxNo = this.baseMapper.selectMaxQuestionnaireNo();
+        String questionnaireNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.QUESTIONNAIRE, null, maxNo);
+        questionnaire.setQuestionnaireNo(questionnaireNo);
+        questionnaire.setSenderId(questionnaire.getUserId());
+        questionnaire.setSenderName(questionnaire.getUserName());
+
+        questionnaire.setCustomerId(questionnaire.getCustomerId());
+        questionnaire.setCustomerName(questionnaire.getCustomerName());
+        questionnaire.setSendTime(DateUtil.now());
+        questionnaire.setWriteTime(DateUtil.formatDateTime(new Date()));
+        if (this.baseMapper.insert(questionnaire) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
index c4ecdee..c9042ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java
@@ -55,11 +55,20 @@
     public Page<BizResourceCustomerResultReviewNotice> listPage(Page<BizResourceCustomerResultReviewNotice> page, CustomerResultReviewNoticeListRequest request) {
         QueryWrapper<BizResourceCustomerResultReviewNotice> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getNoticeNo()),"notice_no", request.getNoticeNo());
+        wrapper.like(StringUtils.isNotBlank(request.getNoticeName()),"notice_name", request.getNoticeName());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()),"create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getNoticeDateEnd())){
+            wrapper.apply("{0} <= DATE_FORMAT(notice_date,'%Y-%m-%d')", request.getNoticeDateEnd().split(" ")[0]);
+        }
 
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         wrapper.eq("notice_user_id",authUser.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
index 476f7f1..8498d28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerSuggestFormServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
@@ -32,6 +34,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NoGeneratorUtil;
@@ -63,26 +66,32 @@
 public class BizResourceCustomerSuggestFormServiceImpl extends ServiceImpl<BizResourceCustomerSuggestFormMapper, BizResourceCustomerSuggestForm> implements IBizResourceCustomerSuggestFormService {
     private final AbstractPermissionContext permissionContext;
     private final IBaseApprovalService baseApprovalService;
+    private final ISystemDeptService systemDeptService;
 
     @Override
     public Page<BizResourceCustomerSuggestForm> listPage(Page<BizResourceCustomerSuggestForm> page, SuggestFormApprovalListRequest request) throws Exception {
-        //查看本受检单位提交的
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        List<Long> parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
         QueryWrapper<BizResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
-        if(CollUtil.isNotEmpty(parentDeptIds)){
-            wrapper.in("customer_id", parentDeptIds);
-        }
+        //查看本受检单位提交的
+        Long companyId = systemDeptService.getUserCompany().getId();
+        wrapper.eq("customer_id",companyId);
 
         wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
         wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
                 "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
         page = this.page(page, wrapper);
         for (BizResourceCustomerSuggestForm record : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
new file mode 100644
index 0000000..b7368aa
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java
@@ -0,0 +1,127 @@
+package com.casic.missiles.service.impl.resource;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.enums.business.OrderStatusDictEnum;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.resource.BizResourceCustomerSuggestFormMapper;
+import com.casic.missiles.mapper.resource.EqptResourceCustomerSuggestFormMapper;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.service.IBaseApprovalService;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService;
+import com.casic.missiles.service.resource.IEqptResourceCustomerSuggestFormService;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUGGEST_FORM_BEAN_NAME;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+@Service(SUGGEST_FORM_BEAN_NAME)
+@RequiredArgsConstructor
+public class EqptResourceCustomerSuggestFormServiceImpl extends CommonApprovalServiceImpl<EqptResourceCustomerSuggestFormMapper, EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> implements IEqptResourceCustomerSuggestFormService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final IBizResourceCustomerSuggestFormService bizSuggestFormService;
+    private final ISystemDeptService systemDeptService;
+    @Override
+    public Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm) {
+        if(StrUtil.isEmpty(suggestForm.getFormNo())){
+            String labCode = suggestForm.getLabCode();
+            Long maxNo = this.baseMapper.selectMaxFormNo();
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, null, maxNo);
+            suggestForm.setFormNo(reportNo);
+        }
+        suggestForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        suggestForm.setHandleStatus("0");
+        this.saveOrUpdate(suggestForm);
+        // 4. 返回申请记录id
+        return suggestForm.getId();
+    }
+
+    @Override
+    public void finishApproval(Long approvalId) {
+        super.finishApproval(approvalId);
+        EqptResourceCustomerSuggestForm suggestForm = this.getById(approvalId);
+        AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+        suggestForm.setApproveUserId(authUser.getId());
+        suggestForm.setApproveUserName(authUser.getName());
+        BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm();
+        BeanUtil.copyProperties(suggestForm,bizSuggestForm);
+        bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime()));
+        bizSuggestForm.setUpdateTime(DateUtil.formatDateTime(suggestForm.getUpdateTime()));
+        bizSuggestForm.setApprovalStatus(null);
+        bizSuggestForm.setProcessId(null);
+        bizSuggestFormService.save(bizSuggestForm);
+    }
+
+    @Override
+    public QueryWrapper<EqptResourceCustomerSuggestForm> commonQuery(SuggestFormApprovalListRequest request) {
+        QueryWrapper<EqptResourceCustomerSuggestForm> wrapper = new QueryWrapper<>();
+        //查询本单位的全部
+//        Long companyId = systemDeptService.getUserCompany().getId();
+//        wrapper.eq("customer_id",companyId);
+
+        wrapper.like(StrUtil.isNotEmpty(request.getFormNo()), "form_no", request.getFormNo());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerName()), "customer_name", request.getCustomerName());
+        wrapper.eq(ObjectUtil.isNotEmpty(request.getCustomerId()), "customer_id", request.getCustomerId());
+        wrapper.like(StrUtil.isNotEmpty(request.getCustomerDeptName()), "customer_dept_name", request.getCustomerDeptName());
+        if(ObjectUtil.isNotEmpty(request.getCustomerDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(request.getCustomerDeptId());
+            deptIds.addAll(systemDeptService.getIdsByPid(request.getCustomerDeptId(),null));
+            wrapper.in("customer_dept_id",deptIds);
+        }
+        wrapper.like(StrUtil.isNotEmpty(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.eq(StrUtil.isNotEmpty(request.getHandleStatus()), "handle_status", request.getHandleStatus());
+
+        return wrapper;
+    }
+
+    @Override
+    public void setBizNo(EqptResourceCustomerSuggestForm obj) {
+        obj.setBizNo(obj.getFormNo());
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
new file mode 100644
index 0000000..0dc28a0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
new file mode 100644
index 0000000..1b4acf7
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.impl.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+@Service
+public class EquipmentBorrowServiceImpl extends ServiceImpl<EquipmentBorrowMapper, EquipmentBorrow> implements IEquipmentBorrowService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
new file mode 100644
index 0000000..67b62bc
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
@@ -0,0 +1,106 @@
+package com.casic.missiles.service.impl.status;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.equipment.EquipmentInfo;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.casic.missiles.mapper.status.EquipmentMaintainMapper;
+import com.casic.missiles.service.equipment.IEquipmentAttachmentService;
+import com.casic.missiles.service.equipment.IEquipmentInfoService;
+import com.casic.missiles.service.status.IEquipmentMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
+import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 服务实现类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+@Service
+@RequiredArgsConstructor
+public class EquipmentMaintainServiceImpl extends ServiceImpl<EquipmentMaintainMapper, EquipmentMaintain> implements IEquipmentMaintainService {
+
+    private final AbstractPermissionContext permissionContext;
+    private final ISystemDeptService deptService;
+    private final IEquipmentInfoService equipmentInfoService;
+    private final IEquipmentAttachmentService attachmentService;
+
+    private final ISystemPositionService positionService;
+
+    @Override
+    public void add(EquipmentMaintain maintain) {
+        this.save(maintain);
+    }
+
+    @Override
+    public void update(EquipmentMaintain maintain) {
+        this.updateById(maintain);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public Page<EquipmentMaintain> listPage(Page<EquipmentMaintain> page, EquipmentMaintainQueryForm queryForm) {
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("e.dept_id");
+
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentName()),"e.equipment_name",queryForm.getEquipmentName());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getModel()),"e.model",queryForm.getModel());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()),"e.manufacture_no",queryForm.getManufactureNo());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"e.company_id",queryForm.getCompanyId());
+        if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            deptIds.add(queryForm.getDeptId());
+            deptIds.addAll(deptService.getIdsByPid(queryForm.getDeptId(),null));
+            queryWrapper.in("e.dept_id",deptIds);
+        }
+        queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getUsePositionId()),"e.use_position_id",queryForm.getUsePositionId());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getUsePosition()),"e.use_position",queryForm.getUsePosition());
+        queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateUserName()),"m.create_user_name",queryForm.getCreateUserName());
+        queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCreateTimeStart()),"m.create_time",queryForm.getCreateTimeStart());
+        queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCreateTimeEnd()),"m.create_time",queryForm.getCreateTimeEnd());
+
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(page,dataScope,queryWrapper);
+        for (EquipmentMaintain maintain : list) {
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+        }
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public EquipmentMaintain detail(Long id) {
+        QueryWrapper<EquipmentMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("m.id",id);
+        List<EquipmentMaintain> list = this.baseMapper.selectScopePage(null,null,queryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            EquipmentMaintain maintain = list.get(0);
+            maintain.setCompanyName(deptService.getDeptName(maintain.getCompanyId()));
+            maintain.setDeptName(deptService.getParentsDeptName(maintain.getDeptId()));
+            maintain.setAttachments(attachmentService.selectByEquipment(maintain.getEquipmentId()));
+            return maintain;
+        }
+        return null;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
index c12fb0d..cd908f4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
@@ -26,9 +26,11 @@
 import com.casic.missiles.service.status.IEquipmentStatusLogService;
 import com.casic.missiles.service.status.IEquipmentStatusRelationService;
 import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.service.system.ISystemPositionService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.RequiredArgsConstructor;
+import org.docx4j.wml.P;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -61,6 +63,7 @@
     private final IEquipmentStatusLogService statusLogService;
     private final ISystemDeptService systemDeptService;
     private final IEquipmentStatusRelationService relationService;
+    private final ISystemPositionService positionService;
 
     @Override
     public Long saveOrUpdateApproval(EquipmentStatusApproval approvalForm) {
@@ -172,6 +175,9 @@
             EquipmentInfo equipmentInfo = equipmentInfoService.getById(approval.getEquipmentId());
             equipmentInfo.setCompanyName(permissionContext.getDeptService().getDeptName(equipmentInfo.getCompanyId()));
             equipmentInfo.setDeptName(permissionContext.getDeptService().getDeptName(equipmentInfo.getDeptId()));
+            if(ObjectUtil.isNotEmpty(equipmentInfo.getUsePositionId())){
+                equipmentInfo.setUsePosition(positionService.getNameById(equipmentInfo.getUsePositionId()));
+            }
             approval.setEquipmentInfo(equipmentInfo);
         }
         return approval;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
index 24df7d7..6fac6e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceCustomerQuestionnaireService.java
@@ -21,4 +21,6 @@
 
     void questionnaireSubmit(BizResourceCustomerQuestionnaire questionnaire);
 
+    ReturnDTO questionnaireAdd(BizResourceCustomerQuestionnaire questionnaire);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java
new file mode 100644
index 0000000..9a52e3b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEqptResourceCustomerSuggestFormService.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.service.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
+import com.casic.missiles.dto.resource.SuggestFormApprovalListRequest;
+import com.casic.missiles.dto.resource.SuggestFormSaveResponse;
+import com.casic.missiles.model.business.EqptBusinessOrderInfo;
+import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
+import com.casic.missiles.model.resource.EqptResourceCustomerSuggestForm;
+import com.casic.missiles.service.ICommonApprovalService;
+
+/**
+ * <p>
+ * 资源管理-委托方管理-委托方意见登记表 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-08
+ */
+public interface IEqptResourceCustomerSuggestFormService extends ICommonApprovalService<EqptResourceCustomerSuggestForm,SuggestFormApprovalListRequest> {
+
+    Long saveOrUpdateApproval(EqptResourceCustomerSuggestForm suggestForm);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
new file mode 100644
index 0000000..a59b3ee
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.service.status;
+
+import com.casic.missiles.model.status.EquipmentBorrowRelation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface IEquipmentBorrowRelationService extends IService<EquipmentBorrowRelation> {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
new file mode 100644
index 0000000..0a88522
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.service.status;
+
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-21
+ */
+public interface IEquipmentBorrowService extends IService<EquipmentBorrow> {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentMaintainService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentMaintainService.java
new file mode 100644
index 0000000..bf791eb
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentMaintainService.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.service.status;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.status.EquipmentMaintainQueryForm;
+import com.casic.missiles.model.status.EquipmentMaintain;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 受检系统-状态维护-故障维修记录表 服务类
+ * </p>
+ *
+ * @author zhangyingjie
+ * @since 2024-02-20
+ */
+public interface IEquipmentMaintainService extends IService<EquipmentMaintain> {
+
+    void add(EquipmentMaintain maintain);
+
+    void update(EquipmentMaintain maintain);
+
+    void delete(Long id);
+
+    Page<EquipmentMaintain> listPage(Page<EquipmentMaintain> page, EquipmentMaintainQueryForm queryForm);
+
+    EquipmentMaintain detail(Long id);
+}