Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspection/QueryInspectionPageListRequest.java

@@ -36,7 +36,7 @@ public class QueryInspectionPageListRequest extends BaseQuery {
     private Integer inspectionLine;
 
     /**
-     * 巡检任务类型: 1 临时巡检(目前只有该一种类型)
+     * 巡检任务类型: 1 临时巡检 2 应急任务
      */
     private Integer type;
 

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

@@ -104,6 +104,9 @@ public class QueryInspectionPageListService {
         String tenantId = CurrentUserUtil.getTenantId();
         request.setTenantId(tenantId);
 
+        // 不查应急任务
+        request.setType(1);
+
         JsonResult result = this.check(tenantId, request);
         if (0 != result.getCode()) {
             log.info("进入查询巡检任务分页列表业务：校验失败：{}", result.getMsg());

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

@@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectInspectionVo"/>
         <where>
             <if test="1 == 1"> and mark = 1 </if>
+            <if test="request.type != null and request.type != 0"> and type = #{request.type} </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>