Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Inspection.java

@@ -274,4 +274,9 @@ public class Inspection extends BaseEntity {
      */
     private String patrolLocation;
 
+    /**
+     * 任务类型：0：巡检任务 1：应急任务
+     */
+    private Integer accidentTask;
+
 }

tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateUser"    column="update_user"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="accidentTask"    column="accident_task"    />
         <result property="mark"    column="mark"    />
     </resultMap>
 
@@ -68,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         execution_start_time, execution_end_time, is_live, is_taken, is_tilt, video_url, ai_video_url, report_url, srt_url,
         status, analyse_status, progressbar, note, weather, fly_height, srt_name, heartbeat_time, execution_status,
         start_longitude, start_latitude, end_longitude, end_latitude, mobile, patrol_location,
-        create_user, create_time, update_user, update_time, mark
+        create_user, create_time, update_user, update_time, accident_task, mark
     </sql>
 
     <sql id="selectInspectionVo">
@@ -78,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         execution_start_time, execution_end_time, is_live, is_taken, is_tilt, video_url, ai_video_url, report_url, srt_url,
         status, analyse_status, progressbar, note, weather, fly_height, srt_name, heartbeat_time, execution_status,
         start_longitude, start_latitude, end_longitude, end_latitude, mobile, patrol_location,
-        create_user, create_time, update_user, update_time, mark
+        create_user, create_time, update_user, update_time, accident_task, mark
         from th_inspection
     </sql>
 
@@ -92,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPageList" parameterType="com.tuoheng.admin.request.inspection.QueryInspectionPageListRequest" resultMap="InspectionResult">
         <include refid="selectInspectionVo"/>
         <where>
-            <if test="1 == 1"> and mark = 1 </if>
+            <if test="1 == 1"> and mark = 1 and accident_task = 0 </if>,
             <if test="request.code != null and request.code != ''"> and code like concat('%', #{request.code}, '%') </if>
             <if test="request.tenantId != null and request.tenantId != ''"> and tenant_id = #{request.tenantId} </if>
             <if test="request.airportId != null and request.airportId != 0"> and airport_id = #{request.airportId} </if>

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/entity/Inspection.java

@@ -270,6 +270,9 @@ public class Inspection extends BaseEntity {
      */
     private String patrolLocation;
 
-
+    /**
+     * 任务类型：0：巡检任务 1应急任务
+     */
+    private Integer accidentTask;
 
 }

tuoheng-service/tuoheng-miniprogram/src/main/resources/mapper/InspectionMapper.xml

@@ -53,6 +53,7 @@
         <result property="endLatitude"    column="end_latitude"    />
         <result property="mobile"    column="mobile"    />
         <result property="patrolLocation"    column="patrol_location"    />
+        <result property="accidentTask"    column="accident_task"    />
         <result property="createUser"    column="create_user"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateUser"    column="update_user"    />