Merge remote-tracking branch 'origin/master'

airport-common/src/main/java/com/sundot/airport/common/enums/ScoreTypeEnum.java

@@ -0,0 +1,29 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 加扣分类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum ScoreTypeEnum {
+
+    ALL("0", "全部"),
+    PLUS("1", "加分"),
+    REDUCE("2", "扣分");
+
+    private final String code;
+    private final String desc;
+
+    public static ScoreTypeEnum getByCode(String code) {
+        for (ScoreTypeEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/ScoreEvent.java

@@ -105,6 +105,33 @@ public class ScoreEvent extends BaseEntity {
     @Excel(name = "层级维度", readConverterExp = "1=部门,2=队室,3=通道,4=员工", combo = "部门,队室,通道,员工")
     private String org;
 
+    @Excel(name = "航站楼ID")
+    private Long terminlId;
+
+    @Excel(name = "航站楼名称")
+    private String terminlName;
+
+    @Excel(name = "区域ID")
+    private Long regionalId;
+
+    @Excel(name = "区域名称")
+    private String regionalName;
+
+    @Excel(name = "通道ID")
+    private Long channelId;
+
+    @Excel(name = "通道名称")
+    private String channelName;
+
+    @Excel(name = "岗位ID")
+    private Long postId;
+
+    @Excel(name = "岗位名称")
+    private String postName;
+
+    @Excel(name = "加扣分类型")
+    private String scoreType;
+
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
 
@@ -191,4 +218,31 @@ public class ScoreEvent extends BaseEntity {
 
     public String getOrg() { return org; }
     public void setOrg(String org) { this.org = org; }
+
+    public Long getTerminlId() { return terminlId; }
+    public void setTerminlId(Long terminlId) { this.terminlId = terminlId; }
+
+    public String getTerminlName() { return terminlName; }
+    public void setTerminlName(String terminlName) { this.terminlName = terminlName; }
+
+    public Long getRegionalId() { return regionalId; }
+    public void setRegionalId(Long regionalId) { this.regionalId = regionalId; }
+
+    public String getRegionalName() { return regionalName; }
+    public void setRegionalName(String regionalName) { this.regionalName = regionalName; }
+
+    public Long getChannelId() { return channelId; }
+    public void setChannelId(Long channelId) { this.channelId = channelId; }
+
+    public String getChannelName() { return channelName; }
+    public void setChannelName(String channelName) { this.channelName = channelName; }
+
+    public Long getPostId() { return postId; }
+    public void setPostId(Long postId) { this.postId = postId; }
+
+    public String getPostName() { return postName; }
+    public void setPostName(String postName) { this.postName = postName; }
+
+    public String getScoreType() { return scoreType; }
+    public void setScoreType(String scoreType) { this.scoreType = scoreType; }
 }

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

@@ -32,6 +32,15 @@
         <result property="importBatch"   column="import_batch"/>
         <result property="evidenceFile"  column="evidence_file"/>
         <result property="org"  column="org"/>
+        <result property="terminlId"  column="terminl_id"/>
+        <result property="terminlName"  column="terminl_name"/>
+        <result property="regionalId"  column="regional_id"/>
+        <result property="regionalName"  column="regional_name"/>
+        <result property="channelId"  column="channel_id"/>
+        <result property="channelName"  column="channel_name"/>
+        <result property="postId"  column="post_id"/>
+        <result property="postName"  column="post_name"/>
+        <result property="scoreType"  column="score_type"/>
         <result property="remark"        column="remark"/>
         <result property="createBy"      column="create_by"/>
         <result property="createTime"    column="create_time"/>
@@ -45,7 +54,9 @@
                level2_name, level3_name, level4_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, org, remark,
+               source_type, source_ledger, import_batch, evidence_file, org,
+               terminl_id, terminl_name, regional_id, regional_name, channel_id, channel_name, post_id, post_name, score_type,
+               remark,
                create_by, create_time, update_by, update_time
         FROM score_event
         WHERE del_flag = '0'
@@ -60,6 +71,17 @@
         <if test="teamId != null">AND team_id = #{teamId}</if>
         <if test="groupId != null">AND group_id = #{groupId}</if>
         <if test="org != null and org != ''">AND org = #{org}</if>
+        <if test="terminlId != null">AND terminl_id = #{terminlId}</if>
+        <if test="terminlName != null and terminlName != ''">AND terminl_name LIKE CONCAT('%', #{terminlName}, '%')</if>
+        <if test="regionalId != null">AND regional_id = #{regionalId}</if>
+        <if test="regionalName != null and regionalName != ''">
+            AND regional_name LIKE CONCAT('%', #{regionalName}, '%')
+        </if>
+        <if test="channelId != null">AND channel_id = #{channelId}</if>
+        <if test="channelName != null and channelName != ''">AND channel_name LIKE CONCAT('%', #{channelName}, '%')</if>
+        <if test="postId != null">AND post_id = #{postId}</if>
+        <if test="postName != null and postName != ''">AND post_name LIKE CONCAT('%', #{postName}, '%')</if>
+        <if test="scoreType != null and scoreType != ''">AND score_type = #{scoreType}</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>