Przeglądaj źródła

层级维度org字段

chenshudong 4 tygodni temu
rodzic
commit
9cd503106f

+ 2 - 0
airport-ledger/src/main/resources/mapper/ledger/ScoreDimensionMapper.xml

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

+ 3 - 1
airport-ledger/src/main/resources/mapper/ledger/ScoreEventMapper.xml

@@ -28,6 +28,7 @@
28
         <result property="sourceLedger"  column="source_ledger"/>
28
         <result property="sourceLedger"  column="source_ledger"/>
29
         <result property="importBatch"   column="import_batch"/>
29
         <result property="importBatch"   column="import_batch"/>
30
         <result property="evidenceFile"  column="evidence_file"/>
30
         <result property="evidenceFile"  column="evidence_file"/>
31
+        <result property="org"  column="org"/>
31
         <result property="remark"        column="remark"/>
32
         <result property="remark"        column="remark"/>
32
         <result property="createBy"      column="create_by"/>
33
         <result property="createBy"      column="create_by"/>
33
         <result property="createTime"    column="create_time"/>
34
         <result property="createTime"    column="create_time"/>
@@ -40,7 +41,7 @@
40
                level2_name, level3_name, level4_name,
41
                level2_name, level3_name, level4_name,
41
                event_time, location, person_id, dept_id, team_id, group_id, person_name, dept_name, team_name, group_name,
42
                event_time, location, person_id, dept_id, team_id, group_id, person_name, dept_name, team_name, group_name,
42
                score_value, cascade_score, total_score, event_desc,
43
                score_value, cascade_score, total_score, event_desc,
43
-               source_type, source_ledger, import_batch, evidence_file, remark,
44
+               source_type, source_ledger, import_batch, evidence_file, org, remark,
44
                create_by, create_time, update_by, update_time
45
                create_by, create_time, update_by, update_time
45
         FROM score_event
46
         FROM score_event
46
         WHERE del_flag = '0'
47
         WHERE del_flag = '0'
@@ -54,6 +55,7 @@
54
         <if test="deptId != null">dept_id = #{deptId}</if>
55
         <if test="deptId != null">dept_id = #{deptId}</if>
55
         <if test="teamId != null">team_id = #{teamId}</if>
56
         <if test="teamId != null">team_id = #{teamId}</if>
56
         <if test="groupId != null">group_id = #{groupId}</if>
57
         <if test="groupId != null">group_id = #{groupId}</if>
58
+        <if test="org != null and org != ''">org = #{org}</if>
57
         <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</if>
59
         <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</if>
58
         <if test="deptName != null and deptName != ''">AND dept_name LIKE CONCAT('%', #{deptName}, '%')</if>
60
         <if test="deptName != null and deptName != ''">AND dept_name LIKE CONCAT('%', #{deptName}, '%')</if>
59
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</if>
61
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</if>

+ 3 - 1
airport-ledger/src/main/resources/mapper/ledger/ScoreIndicatorMapper.xml

@@ -13,6 +13,7 @@
13
         <result property="cascadeRule"  column="cascade_rule"/>
13
         <result property="cascadeRule"  column="cascade_rule"/>
14
         <result property="sortOrder"    column="sort_order"/>
14
         <result property="sortOrder"    column="sort_order"/>
15
         <result property="status"       column="status"/>
15
         <result property="status"       column="status"/>
16
+        <result property="org"       column="org"/>
16
         <result property="remark"       column="remark"/>
17
         <result property="remark"       column="remark"/>
17
         <result property="createBy"     column="create_by"/>
18
         <result property="createBy"     column="create_by"/>
18
         <result property="createTime"   column="create_time"/>
19
         <result property="createTime"   column="create_time"/>
@@ -22,7 +23,7 @@
22
 
23
 
23
     <sql id="selectVo">
24
     <sql id="selectVo">
24
         SELECT id, dimension_id, parent_id, level, name, type, score_value, cascade_rule,
25
         SELECT id, dimension_id, parent_id, level, name, type, score_value, cascade_rule,
25
-               sort_order, status, remark, create_by, create_time, update_by, update_time
26
+               sort_order, status, org, remark, create_by, create_time, update_by, update_time
26
         FROM score_indicator
27
         FROM score_indicator
27
         WHERE del_flag = '0'
28
         WHERE del_flag = '0'
28
     </sql>
29
     </sql>
@@ -35,6 +36,7 @@
35
         <if test="level != null">AND level = #{level}</if>
36
         <if test="level != null">AND level = #{level}</if>
36
         <if test="name != null and name != ''">AND name LIKE CONCAT('%', #{name}, '%')</if>
37
         <if test="name != null and name != ''">AND name LIKE CONCAT('%', #{name}, '%')</if>
37
         <if test="status != null and status != ''">AND status = #{status}</if>
38
         <if test="status != null and status != ''">AND status = #{status}</if>
39
+        <if test="org != null and org != ''">AND org = #{org}</if>
38
         ORDER BY dimension_id ASC, sort_order ASC, id ASC
40
         ORDER BY dimension_id ASC, sort_order ASC, id ASC
39
     </select>
41
     </select>
40
 
42