Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/entity/query/InspectionQuery.java

@@ -56,7 +56,7 @@ public class InspectionQuery extends BaseQuery {
     private String inspectionLineName;
 
     /**
-     * 巡检任务类型 1 临时巡检
+     * 巡检任务类型  0周期任务 1 单次任务|周期子任务  2 应急任务
      */
     private Integer type;
 

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java

@@ -80,7 +80,7 @@ public class InspectionServiceImpl implements IInspectionService {
         String tenantId = user.getTenantId();
 
         query.setTenantId(tenantId);
-        query.setType(1);
+//        query.setType(1);
 
         //初始部门id
         String deptIdInt = query.getDeptId();
@@ -242,7 +242,7 @@ public class InspectionServiceImpl implements IInspectionService {
 
     private Map<Integer, AirportLineVo> getAirportLineMap(List<InspectionInfoVo> inspectionInfoVoList) {
         List<Integer> airportLineIdList = inspectionInfoVoList.stream().map(o -> o.getInspectionLine()).collect(Collectors.toList());
-        airportLineIdList = airportLineIdList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(x->x))), ArrayList::new));
+//        airportLineIdList = airportLineIdList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(x->x))), ArrayList::new));
         List<AirportLineVo> airportLineVoList = getAirLineListService.getList(null, airportLineIdList);
         if (CollectionUtil.isEmpty(airportLineVoList)) {
             return null;

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

@@ -82,7 +82,7 @@
         <if test="request.inspectionType !=null">
             and ti.inspection_type = #{request.inspectionType}
         </if>
-        <if test="request.type !=null">
+        <if test="request.type !=null and (request.type == 0 or request.type == 1)">
             and ti.type = #{request.type}
         </if>
         <if test="request.startTimeDate !=null and request.endTimeDate !=null">