Merge remote-tracking branch 'origin/master'

airport-ledger/src/main/resources/mapper/ledger/LedgerRealtimeInterceptionMapper.xml

@@ -18,6 +18,7 @@
         <result property="inspectorName" column="inspector_name" />
         <result property="inspectorId" column="inspector_id" />
         <result property="channelNo" column="channel_no" />
+        <result property="channelId" column="channel_id" />
         <result property="itemName" column="item_name" />
         <result property="itemQuantity" column="item_quantity" />
         <result property="problemLevel" column="problem_level" />
@@ -39,7 +40,7 @@
     <sql id="selectVo">
         SELECT id, record_date, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
                location, position, position_id,
-               inspector_name, inspector_id, channel_no, item_name, item_quantity,
+               inspector_name, inspector_id, channel_no, channel_id, item_name, item_quantity,
                problem_level, check_personnel, evidence_file,
                deduct_score, add_score, score_dimension, score_indicator,
                import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
@@ -87,4 +88,4 @@
         order by total desc
     </select>
 
-</mapper>
+</mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerSecurityTestMapper.xml

@@ -7,6 +7,7 @@
         <result property="recordDate" column="record_date" />
         <result property="region" column="region" />
         <result property="channel" column="channel" />
+        <result property="channelId" column="channel_id" />
         <result property="deptName" column="dept_name" />
         <result property="deptId" column="dept_id" />
         <result property="teamName" column="team_name" />
@@ -41,7 +42,7 @@
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date, region, channel, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
+        SELECT id, record_date, region, channel, channel_id, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
                tester_name, tester_id, tested_name, tested_id, test_type, position_id, test_item, test_result,
                evidence_file, problem_desc, test_level, result_handling, review_material,
                deduct_score, add_score, score_dimension, score_indicator,
@@ -128,4 +129,4 @@
         order by total desc
     </select>
 
-</mapper>
+</mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerServicePatrolMapper.xml

@@ -14,6 +14,7 @@
         <result property="areaId" column="area_id" />
         <result property="location" column="location" />
         <result property="channelNo" column="channel_no" />
+        <result property="channelId" column="channel_id" />
         <result property="position" column="position" />
         <result property="positionId" column="position_id" />
         <result property="inspectedName" column="inspected_name" />
@@ -41,7 +42,7 @@
 
     <sql id="selectVo">
         SELECT id, record_date, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
-               location, channel_no, position, position_id,
+               location, channel_no, channel_id, position, position_id,
                inspected_name, inspected_id,
                problem_desc, service_type, result_handling, problem_level,
                evidence_file, rectification_status, evidence_material, check_personnel,
@@ -71,4 +72,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerSupervisionProblemMapper.xml

@@ -20,6 +20,7 @@
         <result property="problemDesc"            column="problem_desc"     />
         <result property="location"               column="location"         />
         <result property="channelNo"              column="channel_no"       />
+        <result property="channelId"              column="channel_id"       />
         <result property="position"               column="position"         />
         <result property="positionId"             column="position_id"      />
         <result property="resultHandling"         column="result_handling"  />
@@ -44,7 +45,7 @@
     <sql id="selectVo">
         SELECT id, record_date, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
                inspector_name, inspected_name, inspected_id, problem_type, problem_level, problem_desc, location,
-               channel_no, position, position_id, result_handling, basis,
+               channel_no, channel_id, position, position_id, result_handling, basis,
                rectification_status, rectification_evidence, evidence_file,
                deduct_score, add_score, score_dimension, score_indicator, remark,
                import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag

airport-ledger/src/main/resources/mapper/ledger/LedgerUnsafeEventMapper.xml

@@ -21,6 +21,7 @@
         <result property="area" column="area" />
         <result property="areaId" column="area_id" />
         <result property="channelNo" column="channel_no" />
+        <result property="channelId" column="channel_id" />
         <result property="image" column="image" />
         <result property="eventDesc" column="event_desc" />
         <result property="deductScore" column="deduct_score" />
@@ -37,7 +38,7 @@
     <sql id="selectVo">
         SELECT id, record_date, flight_no, dept_name, dept_id, team_name, team_id, group_name, group_id,
                responsible_name, responsible_id, event_type, involved_items,
-               position, position_id, area, area_id, channel_no, image, event_desc,
+               position, position_id, area, area_id, channel_no, channel_id, image, event_desc,
                deduct_score, evidence_file,
                import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_unsafe_event
@@ -111,4 +112,4 @@
         <if test="teamId != null">AND team_id = #{teamId}</if>
         <if test="groupId != null">AND group_id = #{groupId}</if>
     </sql>
-</mapper>
+</mapper>