Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/v2.0.0' into v2.0.0

lixing 3 gadi atpakaļ
vecāks
revīzija
63d1e69bb6

+ 1 - 1
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/controller/AlarmRecordController.java

@@ -257,7 +257,7 @@ public class AlarmRecordController {
         String treatState = EnumAlarmTreatState.HANDLING.getType();
         List<String> recordIds = alarmRecordConvertWorkOrderDTO.getIds();
 
-        return updateAlarmRecordTreatState(treatMode, treatState,null,null, recordIds);
+        return updateAlarmRecordTreatState(treatMode, treatState,alarmRecordConvertWorkOrderDTO.getOrderId(),alarmRecordConvertWorkOrderDTO.getOrderState(), recordIds);
     }
 
 

+ 6 - 0
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/model/dto/AlarmRecordConvertWorkOrderDTO.java

@@ -17,4 +17,10 @@ import java.util.List;
 public class AlarmRecordConvertWorkOrderDTO {
     @ApiModelProperty(value = "报警记录id")
     private List<String> ids;
+
+    @ApiModelProperty(value = "工单id")
+    private String orderId;
+
+    @ApiModelProperty(value = "工单状态")
+    private String orderState;
 }