Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/LiveHandle.java

@@ -23,7 +23,9 @@ public class LiveHandle implements GenerateInspectionFieldHander {
      *
      * 直播：
      *      1)、处于任务飞行中状态时显示直播
-     * 	    1)、飞手值飞，创建任务时选择不直播的任务，无此按钮
+     * 	    2)、机场巡逻，飞行中的任务，显示【直播】按钮
+     * 	    3)、飞手值飞，创建任务时选择不直播的任务，无【直播】按钮
+     *
      *
      * @param inspectionVo
      */
@@ -36,17 +38,18 @@ public class LiveHandle implements GenerateInspectionFieldHander {
             }
             return;
         }
-        if (InspectionTypeEnum.MABNNEDFLIGHT.getCode() != inspectionVo.getInspectionType()) {
+        if (InspectionTypeEnum.AIRPORT.getCode() == inspectionVo.getInspectionType()) {
+            inspectionVo.setLive(true);
+        } else if (InspectionTypeEnum.MABNNEDFLIGHT.getCode() == inspectionVo.getInspectionType()) {
+            if (null != inspectionVo.getIsLive() && 1 == inspectionVo.getIsLive()) {
+                inspectionVo.setLive(true);
+            }
+        } else {
             if (null != handler) {
                 handler.handler(user, dept, inspectionVo);
             }
             return;
         }
-
-        if (null != inspectionVo.getIsLive() && 1 == inspectionVo.getIsLive()) {
-            inspectionVo.setLive(true);
-        }
-
         if (null != handler) {
             handler.handler(user, dept, inspectionVo);
         }