Merge branch 'develop' of gitadmin/tuoheng_freeway into release

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

@@ -287,8 +287,6 @@ public class QueryInspectionPageListService {
         return inspectionVoList;
     }
 
-
-
     /**
      *  设置任务列表中每一个任务的部门名称
      *      查询到的任务列表中的部门Id，作为部门id列表，查询所有的部门，该结果数据量不会太大，放到map中

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionVo.java

@@ -28,7 +28,7 @@ public class InspectionVo extends BaseEntity {
     /**
      * 部门ID
      */
-     private String deptId;
+    private String deptId;
 
     /**
      * 部门名称
@@ -212,7 +212,6 @@ public class InspectionVo extends BaseEntity {
     private Integer analyseStatus;
 
     /**
-     *
      * ai任务分析进度
      */
     private BigDecimal progressbar;
@@ -342,6 +341,9 @@ public class InspectionVo extends BaseEntity {
      */
     private String createUserName;
 
+    /**
+     * 周期性任务id
+     */
+    private String inspectionCycleId;
 
-
-}
+}

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

@@ -12,17 +12,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name"    column="name"    />
         <result property="type"    column="type"    />
         <result property="roadId"    column="road_id"    />
-<!--        <result property="roadName"    column="road_name"    />-->
         <result property="sectionId"    column="section_id"    />
-<!--        <result property="sectionName"    column="section_name"    />-->
         <result property="inspectionType"    column="inspection_type"    />
-        <result property="inspectionCycleId"    column="inspection_cycleId_id"    />
+        <result property="inspectionCycleId"    column="inspection_cycle_id"    />
         <result property="airportTaskId"    column="airport_task_id"    />
         <result property="airportId"    column="airport_id"    />
-<!--        <result property="airportName"    column="airport_name"    />-->
         <result property="droneId"    column="drone_id"    />
         <result property="inspectionLine"    column="inspection_line"    />
-<!--        <result property="inspectionLineName"    column="inspection_line_name"    />-->
         <result property="equipmentId"    column="equipment_id"    />
         <result property="equipmentName"    column="equipment_name"    />
         <result property="equipmentMountId"    column="equipment_mount_id"    />