Merge remote-tracking branch 'origin/master'

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

@@ -9,6 +9,7 @@
         <result property="baseScore"  column="base_score"/>
         <result property="sortOrder"  column="sort_order"/>
         <result property="status"     column="status"/>
+        <result property="org"     column="org"/>
         <result property="remark"     column="remark"/>
         <result property="createBy"   column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -28,6 +29,7 @@
         <include refid="selectVo"/>
         <if test="name != null and name != ''">AND name LIKE CONCAT('%', #{name}, '%')</if>
         <if test="status != null and status != ''">AND status = #{status}</if>
+        <if test="org != null and org != ''">AND org = #{org}</if>
         ORDER BY sort_order ASC, id ASC
     </select>
 

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

@@ -12,6 +12,10 @@
         <result property="level4Name"    column="level4_name"/>
         <result property="eventTime"     column="event_time"/>
         <result property="location"      column="location"/>
+        <result property="personId"    column="person_id"/>
+        <result property="deptId"    column="dept_id"/>
+        <result property="teamId"    column="team_id"/>
+        <result property="groupId"    column="group_id"/>
         <result property="personName"    column="person_name"/>
         <result property="deptName"      column="dept_name"/>
         <result property="teamName"      column="team_name"/>
@@ -24,6 +28,7 @@
         <result property="sourceLedger"  column="source_ledger"/>
         <result property="importBatch"   column="import_batch"/>
         <result property="evidenceFile"  column="evidence_file"/>
+        <result property="org"  column="org"/>
         <result property="remark"        column="remark"/>
         <result property="createBy"      column="create_by"/>
         <result property="createTime"    column="create_time"/>
@@ -34,9 +39,9 @@
     <sql id="selectVo">
         SELECT id, dimension_id, dimension_name, indicator_id,
                level2_name, level3_name, level4_name,
-               event_time, location, person_name, dept_name, team_name, group_name,
+               event_time, location, person_id, dept_id, team_id, group_id, person_name, dept_name, team_name, group_name,
                score_value, cascade_score, total_score, event_desc,
-               source_type, source_ledger, import_batch, evidence_file, remark,
+               source_type, source_ledger, import_batch, evidence_file, org, remark,
                create_by, create_time, update_by, update_time
         FROM score_event
         WHERE del_flag = '0'
@@ -46,6 +51,11 @@
             resultMap="ScoreEventResult">
         <include refid="selectVo"/>
         <if test="dimensionId != null">AND dimension_id = #{dimensionId}</if>
+        <if test="personId != null">person_id = #{personId}</if>
+        <if test="deptId != null">dept_id = #{deptId}</if>
+        <if test="teamId != null">team_id = #{teamId}</if>
+        <if test="groupId != null">group_id = #{groupId}</if>
+        <if test="org != null and org != ''">org = #{org}</if>
         <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</if>
         <if test="deptName != null and deptName != ''">AND dept_name LIKE CONCAT('%', #{deptName}, '%')</if>
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</if>

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

@@ -13,6 +13,7 @@
         <result property="cascadeRule"  column="cascade_rule"/>
         <result property="sortOrder"    column="sort_order"/>
         <result property="status"       column="status"/>
+        <result property="org"       column="org"/>
         <result property="remark"       column="remark"/>
         <result property="createBy"     column="create_by"/>
         <result property="createTime"   column="create_time"/>
@@ -22,7 +23,7 @@
 
     <sql id="selectVo">
         SELECT id, dimension_id, parent_id, level, name, type, score_value, cascade_rule,
-               sort_order, status, remark, create_by, create_time, update_by, update_time
+               sort_order, status, org, remark, create_by, create_time, update_by, update_time
         FROM score_indicator
         WHERE del_flag = '0'
     </sql>
@@ -35,6 +36,7 @@
         <if test="level != null">AND level = #{level}</if>
         <if test="name != null and name != ''">AND name LIKE CONCAT('%', #{name}, '%')</if>
         <if test="status != null and status != ''">AND status = #{status}</if>
+        <if test="org != null and org != ''">AND org = #{org}</if>
         ORDER BY dimension_id ASC, sort_order ASC, id ASC
     </select>