diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
index c447837..6746312 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.SignalGeneratorStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 10:30
@@ -22,7 +24,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) {
             signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -41,7 +43,7 @@
 //            signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : "");
 //            signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -62,10 +64,10 @@
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : "");
             signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
-            if (signalGenerator.getExceedMarkOne() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMarkOne()) && signalGenerator.getExceedMarkOne() == 1) {
                 signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd());
             }
         }
@@ -82,7 +84,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation());
             }
         }
@@ -99,7 +101,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
index c447837..6746312 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.SignalGeneratorStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 10:30
@@ -22,7 +24,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) {
             signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -41,7 +43,7 @@
 //            signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : "");
 //            signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -62,10 +64,10 @@
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : "");
             signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
-            if (signalGenerator.getExceedMarkOne() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMarkOne()) && signalGenerator.getExceedMarkOne() == 1) {
                 signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd());
             }
         }
@@ -82,7 +84,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation());
             }
         }
@@ -99,7 +101,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 5ed1542..5261c8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -138,6 +138,9 @@
         approvalRejectRequest.setComments(request.getComments());
         //西昌驳回到上一节点
         ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            return updateApprovalStatus(request.getId(), null, ApprovalStatusEnum.FAILED);
+        }
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
             return returnDTO;
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
index c447837..6746312 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.SignalGeneratorStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 10:30
@@ -22,7 +24,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) {
             signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -41,7 +43,7 @@
 //            signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : "");
 //            signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -62,10 +64,10 @@
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : "");
             signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
-            if (signalGenerator.getExceedMarkOne() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMarkOne()) && signalGenerator.getExceedMarkOne() == 1) {
                 signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd());
             }
         }
@@ -82,7 +84,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation());
             }
         }
@@ -99,7 +101,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 5ed1542..5261c8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -138,6 +138,9 @@
         approvalRejectRequest.setComments(request.getComments());
         //西昌驳回到上一节点
         ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            return updateApprovalStatus(request.getId(), null, ApprovalStatusEnum.FAILED);
+        }
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
             return returnDTO;
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index c32a69e..940e6c1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -538,6 +538,30 @@
 
     @Override
     @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval();
+            equipmentInfoApproval.setId(request.getId());
+            equipmentInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = equipmentInfoApprovalMapper.updateById(equipmentInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
     public ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request) {
         ApprovalRevokeRequest approvalRevokeRequest = new ApprovalRevokeRequest();
         approvalRevokeRequest.setProcessInstanceId(request.getProcessInstanceId());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
index c447837..6746312 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.SignalGeneratorStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 10:30
@@ -22,7 +24,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) {
             signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -41,7 +43,7 @@
 //            signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : "");
 //            signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -62,10 +64,10 @@
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : "");
             signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
-            if (signalGenerator.getExceedMarkOne() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMarkOne()) && signalGenerator.getExceedMarkOne() == 1) {
                 signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd());
             }
         }
@@ -82,7 +84,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation());
             }
         }
@@ -99,7 +101,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 5ed1542..5261c8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -138,6 +138,9 @@
         approvalRejectRequest.setComments(request.getComments());
         //西昌驳回到上一节点
         ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            return updateApprovalStatus(request.getId(), null, ApprovalStatusEnum.FAILED);
+        }
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
             return returnDTO;
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index c32a69e..940e6c1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -538,6 +538,30 @@
 
     @Override
     @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval();
+            equipmentInfoApproval.setId(request.getId());
+            equipmentInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = equipmentInfoApprovalMapper.updateById(equipmentInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
     public ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request) {
         ApprovalRevokeRequest approvalRevokeRequest = new ApprovalRevokeRequest();
         approvalRevokeRequest.setProcessInstanceId(request.getProcessInstanceId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index 35349c4..dedf36d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -373,6 +373,30 @@
         ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
         approvalRejectRequest.setTaskId(request.getTaskId());
         approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentStandardInfoApproval standardInfoApproval = new BizEquipmentStandardInfoApproval();
+            standardInfoApproval.setId(request.getId());
+            standardInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = standardInfoApprovalMapper.updateById(standardInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
         //西昌拒绝 = 驳回
         ReturnDTO returnDTO = approvalOperateService.reject(approvalRejectRequest);
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
index c447837..6746312 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.SignalGeneratorStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 10:30
@@ -22,7 +24,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) {
             signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -41,7 +43,7 @@
 //            signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : "");
 //            signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -62,10 +64,10 @@
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : "");
             signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
-            if (signalGenerator.getExceedMarkOne() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMarkOne()) && signalGenerator.getExceedMarkOne() == 1) {
                 signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd());
             }
         }
@@ -82,7 +84,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation());
             }
         }
@@ -99,7 +101,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 5ed1542..5261c8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -138,6 +138,9 @@
         approvalRejectRequest.setComments(request.getComments());
         //西昌驳回到上一节点
         ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            return updateApprovalStatus(request.getId(), null, ApprovalStatusEnum.FAILED);
+        }
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
             return returnDTO;
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index c32a69e..940e6c1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -538,6 +538,30 @@
 
     @Override
     @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval();
+            equipmentInfoApproval.setId(request.getId());
+            equipmentInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = equipmentInfoApprovalMapper.updateById(equipmentInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
     public ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request) {
         ApprovalRevokeRequest approvalRevokeRequest = new ApprovalRevokeRequest();
         approvalRevokeRequest.setProcessInstanceId(request.getProcessInstanceId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index 35349c4..dedf36d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -373,6 +373,30 @@
         ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
         approvalRejectRequest.setTaskId(request.getTaskId());
         approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentStandardInfoApproval standardInfoApproval = new BizEquipmentStandardInfoApproval();
+            standardInfoApproval.setId(request.getId());
+            standardInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = standardInfoApprovalMapper.updateById(standardInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
         //西昌拒绝 = 驳回
         ReturnDTO returnDTO = approvalOperateService.reject(approvalRejectRequest);
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index e1f732b..000d6fd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -292,16 +292,28 @@
         //设置驳回状态为未通过
         runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.FAILED_REJECT);
 
-        //驳回至指定节点，现驳回到上一节点（倒排的第二个节点）
-        HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+        //一个流程节点中多个审批人数量
+        int size = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list().size();
+        //驳回至指定节点，现驳回到上一节点（倒排的当前节点的审批人数量个）
+        HistoricTaskInstance hisTaskInstance = historyService.createHistoricTaskInstanceQuery()
                 .processInstanceId(task.getProcessInstanceId())
                 .orderByHistoricTaskInstanceStartTime()
-                .desc().list().get(1);
+                .desc().list().get(size);
+        HistoricTaskInstance firstTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                .processInstanceId(task.getProcessInstanceId())
+                .orderByHistoricTaskInstanceStartTime()
+                .asc().list().get(0);
 
         runtimeService.createChangeActivityStateBuilder()
                 .processInstanceId(task.getProcessInstanceId())
-                .moveActivityIdTo(task.getTaskDefinitionKey(), historicTaskInstance.getTaskDefinitionKey())
+                .moveActivityIdTo(task.getTaskDefinitionKey(), hisTaskInstance.getTaskDefinitionKey())
                 .changeState();
+
+        //驳回的是发起人节点
+        if (firstTaskInstance.getName().equals(hisTaskInstance.getName())) {
+            return ReturnUtil.success(1000, "发起人节点");
+        }
+
         return ReturnUtil.success();
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
index c447837..6746312 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.SignalGeneratorStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 10:30
@@ -22,7 +24,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) {
             signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -41,7 +43,7 @@
 //            signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : "");
 //            signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -62,10 +64,10 @@
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : "");
             signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
-            if (signalGenerator.getExceedMarkOne() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMarkOne()) && signalGenerator.getExceedMarkOne() == 1) {
                 signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd());
             }
         }
@@ -82,7 +84,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation());
             }
         }
@@ -99,7 +101,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 5ed1542..5261c8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -138,6 +138,9 @@
         approvalRejectRequest.setComments(request.getComments());
         //西昌驳回到上一节点
         ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            return updateApprovalStatus(request.getId(), null, ApprovalStatusEnum.FAILED);
+        }
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
             return returnDTO;
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index c32a69e..940e6c1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -538,6 +538,30 @@
 
     @Override
     @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval();
+            equipmentInfoApproval.setId(request.getId());
+            equipmentInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = equipmentInfoApprovalMapper.updateById(equipmentInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
     public ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request) {
         ApprovalRevokeRequest approvalRevokeRequest = new ApprovalRevokeRequest();
         approvalRevokeRequest.setProcessInstanceId(request.getProcessInstanceId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index 35349c4..dedf36d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -373,6 +373,30 @@
         ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
         approvalRejectRequest.setTaskId(request.getTaskId());
         approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentStandardInfoApproval standardInfoApproval = new BizEquipmentStandardInfoApproval();
+            standardInfoApproval.setId(request.getId());
+            standardInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = standardInfoApprovalMapper.updateById(standardInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
         //西昌拒绝 = 驳回
         ReturnDTO returnDTO = approvalOperateService.reject(approvalRejectRequest);
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index e1f732b..000d6fd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -292,16 +292,28 @@
         //设置驳回状态为未通过
         runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.FAILED_REJECT);
 
-        //驳回至指定节点，现驳回到上一节点（倒排的第二个节点）
-        HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+        //一个流程节点中多个审批人数量
+        int size = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list().size();
+        //驳回至指定节点，现驳回到上一节点（倒排的当前节点的审批人数量个）
+        HistoricTaskInstance hisTaskInstance = historyService.createHistoricTaskInstanceQuery()
                 .processInstanceId(task.getProcessInstanceId())
                 .orderByHistoricTaskInstanceStartTime()
-                .desc().list().get(1);
+                .desc().list().get(size);
+        HistoricTaskInstance firstTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                .processInstanceId(task.getProcessInstanceId())
+                .orderByHistoricTaskInstanceStartTime()
+                .asc().list().get(0);
 
         runtimeService.createChangeActivityStateBuilder()
                 .processInstanceId(task.getProcessInstanceId())
-                .moveActivityIdTo(task.getTaskDefinitionKey(), historicTaskInstance.getTaskDefinitionKey())
+                .moveActivityIdTo(task.getTaskDefinitionKey(), hisTaskInstance.getTaskDefinitionKey())
                 .changeState();
+
+        //驳回的是发起人节点
+        if (firstTaskInstance.getName().equals(hisTaskInstance.getName())) {
+            return ReturnUtil.success(1000, "发起人节点");
+        }
+
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
index 94f239e..be90c2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
@@ -22,7 +22,6 @@
 import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NoGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,8 +58,10 @@
         //生成编号
         String labCode = request.getLabCode();
         String groupCode = request.getGroupCode();
-        Long maxNo = this.baseMapper.selectMaxOrderNo();
-        String orderNo = NoGeneratorUtil.getBizCode(NoGenerateFileCodeEnum.N, labCode, NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER, groupCode, maxNo);
+        String orderNo = NoGenerateFileCodeEnum.N +"-"+ labCode +"-"+ NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER +"-"+ groupCode +"-"+ "000";
+        if (StringUtils.isEmpty(groupCode)) {
+            orderNo = NoGenerateFileCodeEnum.N +"-"+ labCode +"-"+ NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER +"-"+ "000";
+        }
         request.setOrderNo(orderNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
index c447837..6746312 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.SignalGeneratorStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 10:30
@@ -22,7 +24,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) {
             signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -41,7 +43,7 @@
 //            signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : "");
 //            signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -62,10 +64,10 @@
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : "");
             signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
-            if (signalGenerator.getExceedMarkOne() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMarkOne()) && signalGenerator.getExceedMarkOne() == 1) {
                 signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd());
             }
         }
@@ -82,7 +84,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation());
             }
         }
@@ -99,7 +101,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 5ed1542..5261c8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -138,6 +138,9 @@
         approvalRejectRequest.setComments(request.getComments());
         //西昌驳回到上一节点
         ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            return updateApprovalStatus(request.getId(), null, ApprovalStatusEnum.FAILED);
+        }
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
             return returnDTO;
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index c32a69e..940e6c1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -538,6 +538,30 @@
 
     @Override
     @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval();
+            equipmentInfoApproval.setId(request.getId());
+            equipmentInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = equipmentInfoApprovalMapper.updateById(equipmentInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
     public ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request) {
         ApprovalRevokeRequest approvalRevokeRequest = new ApprovalRevokeRequest();
         approvalRevokeRequest.setProcessInstanceId(request.getProcessInstanceId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index 35349c4..dedf36d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -373,6 +373,30 @@
         ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
         approvalRejectRequest.setTaskId(request.getTaskId());
         approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentStandardInfoApproval standardInfoApproval = new BizEquipmentStandardInfoApproval();
+            standardInfoApproval.setId(request.getId());
+            standardInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = standardInfoApprovalMapper.updateById(standardInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
         //西昌拒绝 = 驳回
         ReturnDTO returnDTO = approvalOperateService.reject(approvalRejectRequest);
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index e1f732b..000d6fd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -292,16 +292,28 @@
         //设置驳回状态为未通过
         runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.FAILED_REJECT);
 
-        //驳回至指定节点，现驳回到上一节点（倒排的第二个节点）
-        HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+        //一个流程节点中多个审批人数量
+        int size = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list().size();
+        //驳回至指定节点，现驳回到上一节点（倒排的当前节点的审批人数量个）
+        HistoricTaskInstance hisTaskInstance = historyService.createHistoricTaskInstanceQuery()
                 .processInstanceId(task.getProcessInstanceId())
                 .orderByHistoricTaskInstanceStartTime()
-                .desc().list().get(1);
+                .desc().list().get(size);
+        HistoricTaskInstance firstTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                .processInstanceId(task.getProcessInstanceId())
+                .orderByHistoricTaskInstanceStartTime()
+                .asc().list().get(0);
 
         runtimeService.createChangeActivityStateBuilder()
                 .processInstanceId(task.getProcessInstanceId())
-                .moveActivityIdTo(task.getTaskDefinitionKey(), historicTaskInstance.getTaskDefinitionKey())
+                .moveActivityIdTo(task.getTaskDefinitionKey(), hisTaskInstance.getTaskDefinitionKey())
                 .changeState();
+
+        //驳回的是发起人节点
+        if (firstTaskInstance.getName().equals(hisTaskInstance.getName())) {
+            return ReturnUtil.success(1000, "发起人节点");
+        }
+
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
index 94f239e..be90c2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
@@ -22,7 +22,6 @@
 import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NoGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,8 +58,10 @@
         //生成编号
         String labCode = request.getLabCode();
         String groupCode = request.getGroupCode();
-        Long maxNo = this.baseMapper.selectMaxOrderNo();
-        String orderNo = NoGeneratorUtil.getBizCode(NoGenerateFileCodeEnum.N, labCode, NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER, groupCode, maxNo);
+        String orderNo = NoGenerateFileCodeEnum.N +"-"+ labCode +"-"+ NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER +"-"+ groupCode +"-"+ "000";
+        if (StringUtils.isEmpty(groupCode)) {
+            orderNo = NoGenerateFileCodeEnum.N +"-"+ labCode +"-"+ NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER +"-"+ "000";
+        }
         request.setOrderNo(orderNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java
index d15d7cb..ae76e88 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java
@@ -47,6 +47,8 @@
 
     ReturnDTO approvalRefuse(BaseApprovalRefuseRequest request);
 
+    ReturnDTO approvalReject(BaseApprovalRefuseRequest request);
+
     ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request);
 
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
index c447837..6746312 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.SignalGeneratorStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 10:30
@@ -22,7 +24,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) {
             signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -41,7 +43,7 @@
 //            signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : "");
 //            signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -62,10 +64,10 @@
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : "");
             signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
-            if (signalGenerator.getExceedMarkOne() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMarkOne()) && signalGenerator.getExceedMarkOne() == 1) {
                 signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd());
             }
         }
@@ -82,7 +84,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation());
             }
         }
@@ -99,7 +101,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 5ed1542..5261c8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -138,6 +138,9 @@
         approvalRejectRequest.setComments(request.getComments());
         //西昌驳回到上一节点
         ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            return updateApprovalStatus(request.getId(), null, ApprovalStatusEnum.FAILED);
+        }
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
             return returnDTO;
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index c32a69e..940e6c1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -538,6 +538,30 @@
 
     @Override
     @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval();
+            equipmentInfoApproval.setId(request.getId());
+            equipmentInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = equipmentInfoApprovalMapper.updateById(equipmentInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
     public ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request) {
         ApprovalRevokeRequest approvalRevokeRequest = new ApprovalRevokeRequest();
         approvalRevokeRequest.setProcessInstanceId(request.getProcessInstanceId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index 35349c4..dedf36d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -373,6 +373,30 @@
         ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
         approvalRejectRequest.setTaskId(request.getTaskId());
         approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentStandardInfoApproval standardInfoApproval = new BizEquipmentStandardInfoApproval();
+            standardInfoApproval.setId(request.getId());
+            standardInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = standardInfoApprovalMapper.updateById(standardInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
         //西昌拒绝 = 驳回
         ReturnDTO returnDTO = approvalOperateService.reject(approvalRejectRequest);
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index e1f732b..000d6fd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -292,16 +292,28 @@
         //设置驳回状态为未通过
         runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.FAILED_REJECT);
 
-        //驳回至指定节点，现驳回到上一节点（倒排的第二个节点）
-        HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+        //一个流程节点中多个审批人数量
+        int size = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list().size();
+        //驳回至指定节点，现驳回到上一节点（倒排的当前节点的审批人数量个）
+        HistoricTaskInstance hisTaskInstance = historyService.createHistoricTaskInstanceQuery()
                 .processInstanceId(task.getProcessInstanceId())
                 .orderByHistoricTaskInstanceStartTime()
-                .desc().list().get(1);
+                .desc().list().get(size);
+        HistoricTaskInstance firstTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                .processInstanceId(task.getProcessInstanceId())
+                .orderByHistoricTaskInstanceStartTime()
+                .asc().list().get(0);
 
         runtimeService.createChangeActivityStateBuilder()
                 .processInstanceId(task.getProcessInstanceId())
-                .moveActivityIdTo(task.getTaskDefinitionKey(), historicTaskInstance.getTaskDefinitionKey())
+                .moveActivityIdTo(task.getTaskDefinitionKey(), hisTaskInstance.getTaskDefinitionKey())
                 .changeState();
+
+        //驳回的是发起人节点
+        if (firstTaskInstance.getName().equals(hisTaskInstance.getName())) {
+            return ReturnUtil.success(1000, "发起人节点");
+        }
+
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
index 94f239e..be90c2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
@@ -22,7 +22,6 @@
 import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NoGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,8 +58,10 @@
         //生成编号
         String labCode = request.getLabCode();
         String groupCode = request.getGroupCode();
-        Long maxNo = this.baseMapper.selectMaxOrderNo();
-        String orderNo = NoGeneratorUtil.getBizCode(NoGenerateFileCodeEnum.N, labCode, NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER, groupCode, maxNo);
+        String orderNo = NoGenerateFileCodeEnum.N +"-"+ labCode +"-"+ NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER +"-"+ groupCode +"-"+ "000";
+        if (StringUtils.isEmpty(groupCode)) {
+            orderNo = NoGenerateFileCodeEnum.N +"-"+ labCode +"-"+ NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER +"-"+ "000";
+        }
         request.setOrderNo(orderNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java
index d15d7cb..ae76e88 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java
@@ -47,6 +47,8 @@
 
     ReturnDTO approvalRefuse(BaseApprovalRefuseRequest request);
 
+    ReturnDTO approvalReject(BaseApprovalRefuseRequest request);
+
     ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request);
 
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardInfoService.java
index d748fbc..496e99b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardInfoService.java
@@ -38,6 +38,8 @@
 
     ReturnDTO approvalRefuse(BaseApprovalRefuseRequest request);
 
+    ReturnDTO approvalReject(BaseApprovalRefuseRequest request);
+
     ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request);
 
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
index c46e4e1..377e4f4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentInfoController.java
@@ -141,6 +141,12 @@
         return equipmentInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("设备审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return equipmentInfoService.approvalReject(request);
+    }
+
     @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 5c3d614..0f4448f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -123,13 +123,18 @@
     /**
      * 标准装置审批-同意使用通用接口即可
      */
-
     @ApiOperation("标准装置审批-拒绝")
     @PostMapping("/approval/refuse")
     public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) {
         return standardInfoService.approvalRefuse(request);
     }
 
+    @ApiOperation("标准装置审批-驳回")
+    @PostMapping("/approval/reject")
+    public ReturnDTO approvalReject(@RequestBody @Valid BaseApprovalRefuseRequest request) {
+        return standardInfoService.approvalReject(request);
+    }
+
     @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）")
     @PostMapping("/approval/revoke")
     public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
index 926484d..8eb85d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRejectRequest.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 审批驳回请求实体
@@ -12,6 +13,10 @@
  */
 @Data
 public class ApprovalRejectRequest {
+    @ApiModelProperty("审批数据主键id")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
     @ApiModelProperty("任务id")
     @NotBlank(message = "任务id不能为空")
     private String taskId;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 592ae16..f7fb675 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author: TuT
@@ -141,7 +142,7 @@
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
             cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
-            if (cesiumAtom.getExceedMark() != null && cesiumAtom.getExceedMark() == 1){
+            if (Objects.nonNull(cesiumAtom.getExceedMark()) && cesiumAtom.getExceedMark() == 1){
                 cesiumAtom.setDailyAgingRateTwo(cesiumAtom.getDailyAgingRateTwo() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index fbc6f3c..ea6acf8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.LowFrequencySignalStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 15:38
@@ -29,7 +31,7 @@
             }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
             lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
         }
@@ -47,7 +49,7 @@
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getVoltageUnit() : "");
-            if (lowFrequencySignal.getExceedMark() == 1) {
+            if (Objects.nonNull(lowFrequencySignal.getExceedMark()) && lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setFlatness(StringUtils.isNotBlank(lowFrequencySignal.getFlatness()) ? lowFrequencySignal.getFlatness() + "*" : lowFrequencySignal.getFlatness());
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index ef89368..5f0ac46 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.OscilloscopeStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 17:26
@@ -25,7 +27,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -45,8 +47,7 @@
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -64,7 +65,7 @@
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -82,7 +83,7 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
                 oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
             }
         }
@@ -99,7 +100,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -116,7 +117,7 @@
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getCorrectRiseTime())) {
                 oscilloscope.setCorrectRiseTime(oscilloscope.getCorrectRiseTime() + "*");
             }
         }
@@ -136,10 +137,10 @@
             oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
             }
-            if (oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
+            if (Objects.nonNull(oscilloscope.getExceedMarkOne()) && oscilloscope.getExceedMarkOne() == 1 && StringUtils.isNotBlank(oscilloscope.getFrequencyDeviation())) {
                 oscilloscope.setFrequencyDeviation(oscilloscope.getFrequencyDeviation() + "*");
             }
         }
@@ -158,7 +159,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setCycleSignal(StringUtils.isNotBlank(oscilloscope.getCycleSignal()) ? oscilloscope.getCycleSignal() + oscilloscope.getCycleSignalUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getTimeBaseRelativeError())) {
                 oscilloscope.setTimeBaseRelativeError(oscilloscope.getTimeBaseRelativeError() + "*");
             }
         }
@@ -177,7 +178,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
@@ -196,7 +197,7 @@
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
@@ -216,7 +217,7 @@
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getDecibelNumber())) {
                 oscilloscope.setDecibelNumber(oscilloscope.getDecibelNumber() + "*");
             }
         }
@@ -233,7 +234,7 @@
             oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -251,7 +252,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
             }
         }
@@ -269,7 +270,7 @@
             oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
-            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+            if (Objects.nonNull(oscilloscope.getExceedMark()) && oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
index c447837..6746312 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.strategy.SignalGeneratorStrategy;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @Author: TuT
  * @CreateTime: 2024-03-22 10:30
@@ -22,7 +24,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) {
             signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -41,7 +43,7 @@
 //            signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : "");
 //            signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue());
             }
         }
@@ -62,10 +64,10 @@
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : "");
             signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
-            if (signalGenerator.getExceedMarkOne() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMarkOne()) && signalGenerator.getExceedMarkOne() == 1) {
                 signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd());
             }
         }
@@ -82,7 +84,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation());
             }
         }
@@ -99,7 +101,7 @@
             signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : "");
             signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : "");
             signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : "");
-            if (signalGenerator.getExceedMark() == 1) {
+            if (Objects.nonNull(signalGenerator.getExceedMark()) && signalGenerator.getExceedMark() == 1) {
                 signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : "");
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 5ed1542..5261c8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -138,6 +138,9 @@
         approvalRejectRequest.setComments(request.getComments());
         //西昌驳回到上一节点
         ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            return updateApprovalStatus(request.getId(), null, ApprovalStatusEnum.FAILED);
+        }
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
             return returnDTO;
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index c32a69e..940e6c1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -538,6 +538,30 @@
 
     @Override
     @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval();
+            equipmentInfoApproval.setId(request.getId());
+            equipmentInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = equipmentInfoApprovalMapper.updateById(equipmentInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
     public ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request) {
         ApprovalRevokeRequest approvalRevokeRequest = new ApprovalRevokeRequest();
         approvalRevokeRequest.setProcessInstanceId(request.getProcessInstanceId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index 35349c4..dedf36d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -373,6 +373,30 @@
         ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
         approvalRejectRequest.setTaskId(request.getTaskId());
         approvalRejectRequest.setComments(request.getComments());
+        //驳回至上一节点
+        ReturnDTO returnDTO = approvalOperateService.rejectPre(approvalRejectRequest);
+        if (returnDTO.getCode().equals(1000)) {
+            BizEquipmentStandardInfoApproval standardInfoApproval = new BizEquipmentStandardInfoApproval();
+            standardInfoApproval.setId(request.getId());
+            standardInfoApproval.setApprovalStatus(ApprovalStatusEnum.FAILED);
+            int row = standardInfoApprovalMapper.updateById(standardInfoApproval);
+            if (row <= 0) {
+                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+            return ReturnUtil.success();
+        }
+        if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
+            return returnDTO;
+        }
+        return ReturnUtil.success();
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO approvalReject(BaseApprovalRefuseRequest request) {
+        ApprovalRejectRequest approvalRejectRequest = new ApprovalRejectRequest();
+        approvalRejectRequest.setTaskId(request.getTaskId());
+        approvalRejectRequest.setComments(request.getComments());
         //西昌拒绝 = 驳回
         ReturnDTO returnDTO = approvalOperateService.reject(approvalRejectRequest);
         if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(returnDTO.getCode())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index e1f732b..000d6fd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -292,16 +292,28 @@
         //设置驳回状态为未通过
         runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.FAILED_REJECT);
 
-        //驳回至指定节点，现驳回到上一节点（倒排的第二个节点）
-        HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+        //一个流程节点中多个审批人数量
+        int size = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list().size();
+        //驳回至指定节点，现驳回到上一节点（倒排的当前节点的审批人数量个）
+        HistoricTaskInstance hisTaskInstance = historyService.createHistoricTaskInstanceQuery()
                 .processInstanceId(task.getProcessInstanceId())
                 .orderByHistoricTaskInstanceStartTime()
-                .desc().list().get(1);
+                .desc().list().get(size);
+        HistoricTaskInstance firstTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                .processInstanceId(task.getProcessInstanceId())
+                .orderByHistoricTaskInstanceStartTime()
+                .asc().list().get(0);
 
         runtimeService.createChangeActivityStateBuilder()
                 .processInstanceId(task.getProcessInstanceId())
-                .moveActivityIdTo(task.getTaskDefinitionKey(), historicTaskInstance.getTaskDefinitionKey())
+                .moveActivityIdTo(task.getTaskDefinitionKey(), hisTaskInstance.getTaskDefinitionKey())
                 .changeState();
+
+        //驳回的是发起人节点
+        if (firstTaskInstance.getName().equals(hisTaskInstance.getName())) {
+            return ReturnUtil.success(1000, "发起人节点");
+        }
+
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
index 94f239e..be90c2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java
@@ -22,7 +22,6 @@
 import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NoGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,8 +58,10 @@
         //生成编号
         String labCode = request.getLabCode();
         String groupCode = request.getGroupCode();
-        Long maxNo = this.baseMapper.selectMaxOrderNo();
-        String orderNo = NoGeneratorUtil.getBizCode(NoGenerateFileCodeEnum.N, labCode, NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER, groupCode, maxNo);
+        String orderNo = NoGenerateFileCodeEnum.N +"-"+ labCode +"-"+ NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER +"-"+ groupCode +"-"+ "000";
+        if (StringUtils.isEmpty(groupCode)) {
+            orderNo = NoGenerateFileCodeEnum.N +"-"+ labCode +"-"+ NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER +"-"+ "000";
+        }
         request.setOrderNo(orderNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java
index d15d7cb..ae76e88 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentInfoService.java
@@ -47,6 +47,8 @@
 
     ReturnDTO approvalRefuse(BaseApprovalRefuseRequest request);
 
+    ReturnDTO approvalReject(BaseApprovalRefuseRequest request);
+
     ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request);
 
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardInfoService.java
index d748fbc..496e99b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardInfoService.java
@@ -38,6 +38,8 @@
 
     ReturnDTO approvalRefuse(BaseApprovalRefuseRequest request);
 
+    ReturnDTO approvalReject(BaseApprovalRefuseRequest request);
+
     ReturnDTO approvalRevoke(BaseApprovalRevokeRequest request);
 
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/AuthorizeOrderEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/AuthorizeOrderEventPostProcessor.java
index cf9c2fb..8b7ff9c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/AuthorizeOrderEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/AuthorizeOrderEventPostProcessor.java
@@ -3,6 +3,8 @@
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
 import com.casic.missiles.enums.system.ApplyFromIdEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
@@ -13,6 +15,7 @@
 import com.casic.missiles.model.resource.BizResourceStaffAuthorize;
 import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -39,9 +42,13 @@
         //审批通过后关联授权信息
         BizResourceStaffAuthorizeMapper authorizeMapper = SpringContextUtil.getBean(BizResourceStaffAuthorizeMapper.class);
 
-        BizResourceAuthorizeOrder authorizeOrder = new BizResourceAuthorizeOrder();
+        BizResourceAuthorizeOrder authorizeOrder = authorizeOrderMapper.selectById(id);
         authorizeOrder.setId(id);
         authorizeOrder.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Long maxNo = authorizeOrderMapper.selectMaxOrderNo();
+        String orderNo = NoGeneratorUtil.getBizCode(NoGenerateFileCodeEnum.N, authorizeOrder.getLabCode(), NoGenerateRecordTypeCodeEnum.AUTHORIZE_ORDER, authorizeOrder.getGroupCode(), maxNo);
+        authorizeOrder.setOrderNo(orderNo);
+
         int updateFlag = authorizeOrderMapper.updateById(authorizeOrder);
         if (updateFlag <= 0) {
             log.error("授权(代理)委托书审批通过后处理失败");
@@ -49,7 +56,6 @@
         }
 
         //写入审批通过后关联授权信息
-        authorizeOrder = authorizeOrderMapper.selectById(id);
         try {
             DictCodeUtils.convertDictCodeToName(authorizeOrder);
         } catch (Exception ignored) {