ledger_realtime_interception表新增字段和导入功能字段数据新增

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

@@ -30,15 +30,33 @@ public class LedgerRealtimeInterception extends BaseEntity {
     @Excel(name = "部门名称")
     private String deptName;
 
+    private Long deptId;
+
     @Excel(name = "队室/班组")
     private String teamName;
 
+    private Long teamId;
+
     @Excel(name = "小组")
     private String groupName;
 
+    private Long groupId;
+
+    private Long areaId;
+
+    @Excel(name = "区域")
+    private String location;
+
+    @Excel(name = "岗位")
+    private String position;
+
+    private Long positionId;
+
     @Excel(name = "查获人")
     private String inspectorName;
 
+    private Long inspectorId;
+
     @Excel(name = "通道号")
     private String channelNo;
 
@@ -69,6 +87,66 @@ public class LedgerRealtimeInterception extends BaseEntity {
     @Excel(name = "处理结果")
     private String resultHandling;
 
+    @Excel(name = "问题类型")
+    private String problemType;
+
+    @Excel(name = "整改措施")
+    private String rectificationMeasures;
+
+    @Excel(name = "问题层级")
+    private String problemLevel;
+
+    @Excel(name = "附件")
+    private String attachment;
+
+    @Excel(name = "问题类别")
+    private String problemCategory;
+
+    @Excel(name = "个人复盘")
+    private String personalReview;
+
+    @Excel(name = "队室复盘")
+    private String teamReview;
+
+    @Excel(name = "队室质控员")
+    private String qualityOfficer;
+
+    @Excel(name = "质控推送队室负责人")
+    private String qualityPushLeader;
+
+    @Excel(name = "开机年限")
+    private String operationYears;
+
+    @Excel(name = "责任人开机年龄")
+    private String responsibleOperationAge;
+
+    @Excel(name = "发送至相关人员")
+    private String sendToRelevant;
+
+    @Excel(name = "本月内发生问题次数")
+    private Integer monthlyProblemCount;
+
+    @Excel(name = "上月质控问题发生次数")
+    private Integer lastMonthProblemCount;
+
+    @Excel(name = "实时图像漏检难易度")
+    private String imageMissDifficulty;
+
+    @Excel(name = "检查人员")
+    private String checkPersonnel;
+
+    @Excel(name = "部门培训教员")
+    private String deptTrainingInstructor;
+
+    @Excel(name = "分管质控经理")
+    private String manageQcManager;
+
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
+    @Excel(name = "队室负责人")
+    private String teamLeader;
+
     @Excel(name = "扣分")
     private BigDecimal deductScore;
 
@@ -104,15 +182,39 @@ public class LedgerRealtimeInterception extends BaseEntity {
     public String getDeptName() { return deptName; }
     public void setDeptName(String deptName) { this.deptName = deptName; }
 
+    public Long getDeptId() { return deptId; }
+    public void setDeptId(Long deptId) { this.deptId = deptId; }
+
     public String getTeamName() { return teamName; }
     public void setTeamName(String teamName) { this.teamName = teamName; }
 
+    public Long getTeamId() { return teamId; }
+    public void setTeamId(Long teamId) { this.teamId = teamId; }
+
     public String getGroupName() { return groupName; }
     public void setGroupName(String groupName) { this.groupName = groupName; }
 
+    public Long getGroupId() { return groupId; }
+    public void setGroupId(Long groupId) { this.groupId = groupId; }
+
+    public Long getAreaId() { return areaId; }
+    public void setAreaId(Long areaId) { this.areaId = areaId; }
+
+    public String getLocation() { return location; }
+    public void setLocation(String location) { this.location = location; }
+
+    public String getPosition() { return position; }
+    public void setPosition(String position) { this.position = position; }
+
+    public Long getPositionId() { return positionId; }
+    public void setPositionId(Long positionId) { this.positionId = positionId; }
+
     public String getInspectorName() { return inspectorName; }
     public void setInspectorName(String inspectorName) { this.inspectorName = inspectorName; }
 
+    public Long getInspectorId() { return inspectorId; }
+    public void setInspectorId(Long inspectorId) { this.inspectorId = inspectorId; }
+
     public String getChannelNo() { return channelNo; }
     public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
 
@@ -143,6 +245,66 @@ public class LedgerRealtimeInterception extends BaseEntity {
     public String getResultHandling() { return resultHandling; }
     public void setResultHandling(String resultHandling) { this.resultHandling = resultHandling; }
 
+    public String getProblemType() { return problemType; }
+    public void setProblemType(String problemType) { this.problemType = problemType; }
+
+    public String getRectificationMeasures() { return rectificationMeasures; }
+    public void setRectificationMeasures(String rectificationMeasures) { this.rectificationMeasures = rectificationMeasures; }
+
+    public String getProblemLevel() { return problemLevel; }
+    public void setProblemLevel(String problemLevel) { this.problemLevel = problemLevel; }
+
+    public String getAttachment() { return attachment; }
+    public void setAttachment(String attachment) { this.attachment = attachment; }
+
+    public String getProblemCategory() { return problemCategory; }
+    public void setProblemCategory(String problemCategory) { this.problemCategory = problemCategory; }
+
+    public String getPersonalReview() { return personalReview; }
+    public void setPersonalReview(String personalReview) { this.personalReview = personalReview; }
+
+    public String getTeamReview() { return teamReview; }
+    public void setTeamReview(String teamReview) { this.teamReview = teamReview; }
+
+    public String getQualityOfficer() { return qualityOfficer; }
+    public void setQualityOfficer(String qualityOfficer) { this.qualityOfficer = qualityOfficer; }
+
+    public String getQualityPushLeader() { return qualityPushLeader; }
+    public void setQualityPushLeader(String qualityPushLeader) { this.qualityPushLeader = qualityPushLeader; }
+
+    public String getOperationYears() { return operationYears; }
+    public void setOperationYears(String operationYears) { this.operationYears = operationYears; }
+
+    public String getResponsibleOperationAge() { return responsibleOperationAge; }
+    public void setResponsibleOperationAge(String responsibleOperationAge) { this.responsibleOperationAge = responsibleOperationAge; }
+
+    public String getSendToRelevant() { return sendToRelevant; }
+    public void setSendToRelevant(String sendToRelevant) { this.sendToRelevant = sendToRelevant; }
+
+    public Integer getMonthlyProblemCount() { return monthlyProblemCount; }
+    public void setMonthlyProblemCount(Integer monthlyProblemCount) { this.monthlyProblemCount = monthlyProblemCount; }
+
+    public Integer getLastMonthProblemCount() { return lastMonthProblemCount; }
+    public void setLastMonthProblemCount(Integer lastMonthProblemCount) { this.lastMonthProblemCount = lastMonthProblemCount; }
+
+    public String getImageMissDifficulty() { return imageMissDifficulty; }
+    public void setImageMissDifficulty(String imageMissDifficulty) { this.imageMissDifficulty = imageMissDifficulty; }
+
+    public String getCheckPersonnel() { return checkPersonnel; }
+    public void setCheckPersonnel(String checkPersonnel) { this.checkPersonnel = checkPersonnel; }
+
+    public String getDeptTrainingInstructor() { return deptTrainingInstructor; }
+    public void setDeptTrainingInstructor(String deptTrainingInstructor) { this.deptTrainingInstructor = deptTrainingInstructor; }
+
+    public String getManageQcManager() { return manageQcManager; }
+    public void setManageQcManager(String manageQcManager) { this.manageQcManager = manageQcManager; }
+
+    public String getTeamInternalDuty() { return teamInternalDuty; }
+    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+
+    public String getTeamLeader() { return teamLeader; }
+    public void setTeamLeader(String teamLeader) { this.teamLeader = teamLeader; }
+
     public BigDecimal getDeductScore() { return deductScore; }
     public void setDeductScore(BigDecimal deductScore) { this.deductScore = deductScore; }
 

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerCombinedImportServiceImpl.java

@@ -272,25 +272,79 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 3. 部门实时质控拦截情况记录表 → ledger_realtime_interception
-     * R2: 时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 拦截物品(5)
-     *     个数(6) 问题类型(7) 整改措施(8) 问题层级(9) 班组(10)
-     *     附件(11) 问题类别(12)
+     * 导入顺序：时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 实时质控拦截物品(5) 个数(6)
+     *          问题类型(7) 整改措施(8) 问题层级(9) 班组(10) 附件(11) 问题类别(12)
+     *          个人复盘(13) 队室复盘(14) 队室质控员(15) 质控推送队室负责人(16)
+     *          开机年限(17) 责任人开机年龄(18) 发送至相关人员(19) 本月内发生问题次数(20)
+     *          上月质控问题发生次数(21) 实时图像漏检难易度(22) 检查人员(23) 部门培训教员(24)
+     *          分管质控经理(25) 队室内勤(26) 备注(27) 队室负责人(28)
      */
     private int doRealtimeInterception(Sheet sheet, String batchNo, String username) {
         List<LedgerRealtimeInterception> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerRealtimeInterception o = new LedgerRealtimeInterception();
-            o.setRecordDate(date(c, 0));
-            o.setRecordTime(timeStr(c, 0));
-            o.setChannelNo(str(c, 2));
-            o.setInspectorName(str(c, 4));
-            o.setItemName(str(c, 5));
-            o.setItemQuantity(integer(c, 6));
-            o.setItemCategory(str(c, 7));
-            o.setHandlingMethod(str(c, 8));
-            o.setTeamName(str(c, 10));
-            o.setEvidenceFile(str(c, 11));
-            o.setRemark(str(c, 12));
+            
+            // 按照新的导入顺序映射字段
+            o.setRecordDate(date(c, 0));        // 时间
+            o.setLocation(str(c, 1));           // 区域
+            o.setPosition(str(c, 3));           // 岗位
+            o.setChannelNo(str(c, 2));          // 工作点
+            String inspectorName = str(c, 4);   // 责任人
+            o.setItemName(str(c, 5));           // 实时质控拦截物品
+            o.setItemQuantity(integer(c, 6));   // 个数
+            o.setProblemType(str(c, 7));        // 问题类型
+            o.setRectificationMeasures(str(c, 8)); // 整改措施
+            o.setProblemLevel(str(c, 9));       // 问题层级
+            o.setTeamName(str(c, 10));          // 班组
+            o.setAttachment(str(c, 11));        // 附件
+            o.setProblemCategory(str(c, 12));   // 问题类别
+            o.setPersonalReview(str(c, 13));    // 个人复盘
+            o.setTeamReview(str(c, 14));        // 队室复盘
+            o.setQualityOfficer(str(c, 15));    // 队室质控员
+            o.setQualityPushLeader(str(c, 16)); // 质控推送队室负责人
+            o.setOperationYears(str(c, 17));    // 开机年限
+            o.setResponsibleOperationAge(str(c, 18)); // 责任人开机年龄
+            o.setSendToRelevant(str(c, 19));    // 发送至相关人员
+            o.setMonthlyProblemCount(integer(c, 20)); // 本月内发生问题次数
+            o.setLastMonthProblemCount(integer(c, 21)); // 上月质控问题发生次数
+            o.setImageMissDifficulty(str(c, 22)); // 实时图像漏检难易度
+            o.setCheckPersonnel(str(c, 23));    // 检查人员
+            o.setDeptTrainingInstructor(str(c, 24)); // 部门培训教员
+            o.setManageQcManager(str(c, 25));   // 分管质控经理
+            o.setTeamInternalDuty(str(c, 26));  // 队室内勤
+            o.setRemark(str(c, 27));            // 备注
+            o.setTeamLeader(str(c, 28));        // 队室负责人
+            
+            // 根据责任人名称查找组织ID
+            if (inspectorName != null && !inspectorName.trim().isEmpty()) {
+                Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
+                if (!orgInfo.isEmpty()) {
+                    o.setInspectorId(orgInfo.get("userId"));
+                    o.setDeptId(orgInfo.get("deptId"));
+                    o.setTeamId(orgInfo.get("teamId"));
+                    o.setGroupId(orgInfo.get("groupId"));
+                }
+            }
+            
+            // 根据岗位和区域查找对应ID
+            if (importCache != null) {
+                String positionName = str(c, 3);  // 岗位
+                if (positionName != null && !positionName.trim().isEmpty()) {
+                    Long positionId = importCache.getPositionIdByName(positionName.trim());
+                    if (positionId != null) {
+                        o.setPositionId(positionId);
+                    }
+                }
+                
+                String areaName = str(c, 1);  // 区域
+                if (areaName != null && !areaName.trim().isEmpty()) {
+                    Long areaId = importCache.getAreaIdByName(areaName.trim());
+                    if (areaId != null) {
+                        o.setAreaId(areaId);
+                    }
+                }
+            }
+            
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerSyncServiceImpl.java

@@ -210,9 +210,21 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             String src = "realtime_interception:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getInspectorName())) { skip++; continue; }
-            // 实时拦截台账无层级字段，按实际deductScore计分；L3指标默认站层级
-            BigDecimal sv = row.getDeductScore() != null ? row.getDeductScore().negate() : NEG_ONE;
-            ScoreIndicator lv3 = getIndicator(IND_INTERCEPT_L3_STATION);
+            // 取【问题层级】字段，站层级扣1分，部门层级扣0.8分，其它层级跳过
+            String level = row.getProblemLevel() != null ? row.getProblemLevel() : "";
+            long l3Id; BigDecimal sv;
+            if (level.contains("站层级")) {
+                l3Id = IND_INTERCEPT_L3_STATION;
+                sv = row.getDeductScore() != null ? row.getDeductScore().negate() : NEG_ONE;
+            } else if (level.contains("部门层级")) {
+                l3Id = IND_INTERCEPT_L3_DEPT;
+                sv = row.getDeductScore() != null ? row.getDeductScore().negate() : NEG_08;
+            } else {
+                // todo其它层级暂时跳过
+                skip++;
+                continue;
+            }
+            ScoreIndicator lv3 = getIndicator(l3Id);
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getInspectorName(),
                     row.getTeamName(), row.getRecordDate(),
                     row.getChannelNo(), sv, ZERO,

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

@@ -5,10 +5,19 @@
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerRealtimeInterception">
         <id property="id" column="id" />
         <result property="recordDate" column="record_date" />
+        <result property="recordTime" column="record_time" />
         <result property="deptName" column="dept_name" />
+        <result property="deptId" column="dept_id" />
         <result property="teamName" column="team_name" />
+        <result property="teamId" column="team_id" />
         <result property="groupName" column="group_name" />
+        <result property="groupId" column="group_id" />
+        <result property="areaId" column="area_id" />
+        <result property="location" column="location" />
+        <result property="position" column="position" />
+        <result property="positionId" column="position_id" />
         <result property="inspectorName" column="inspector_name" />
+        <result property="inspectorId" column="inspector_id" />
         <result property="channelNo" column="channel_no" />
         <result property="passengerName" column="passenger_name" />
         <result property="idCardNo" column="id_card_no" />
@@ -19,21 +28,51 @@
         <result property="itemWeight" column="item_weight" />
         <result property="handlingMethod" column="handling_method" />
         <result property="resultHandling" column="result_handling" />
+        <result property="problemType" column="problem_type" />
+        <result property="rectificationMeasures" column="rectification_measures" />
+        <result property="problemLevel" column="problem_level" />
+        <result property="attachment" column="attachment" />
+        <result property="problemCategory" column="problem_category" />
+        <result property="personalReview" column="personal_review" />
+        <result property="teamReview" column="team_review" />
+        <result property="qualityOfficer" column="quality_officer" />
+        <result property="qualityPushLeader" column="quality_push_leader" />
+        <result property="operationYears" column="operation_years" />
+        <result property="responsibleOperationAge" column="responsible_operation_age" />
+        <result property="sendToRelevant" column="send_to_relevant" />
+        <result property="monthlyProblemCount" column="monthly_problem_count" />
+        <result property="lastMonthProblemCount" column="last_month_problem_count" />
+        <result property="imageMissDifficulty" column="image_miss_difficulty" />
+        <result property="checkPersonnel" column="check_personnel" />
+        <result property="deptTrainingInstructor" column="dept_training_instructor" />
+        <result property="manageQcManager" column="manage_qc_manager" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
+        <result property="remark" column="remark" />
+        <result property="teamLeader" column="team_leader" />
         <result property="deductScore" column="deduct_score" />
         <result property="addScore" column="add_score" />
         <result property="scoreDimension" column="score_dimension" />
         <result property="scoreIndicator" column="score_indicator" />
         <result property="evidenceFile" column="evidence_file" />
-        <result property="remark" column="remark" />
         <result property="importBatch" column="import_batch" />
-        <result property="sourceType" column="source_type" />        <result property="createBy"   column="create_by"   />
+        <result property="sourceType" column="source_type" />
+        <result property="createBy"   column="create_by"   />
         <result property="createTime" column="create_time" />
         <result property="updateBy"   column="update_by"   />
         <result property="updateTime" column="update_time" />
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date,dept_name,team_name,group_name,inspector_name,channel_no,passenger_name,id_card_no,flight_no,item_category,item_name,item_quantity,item_weight,handling_method,result_handling,deduct_score,add_score,score_dimension,score_indicator,evidence_file,remark,import_batch,source_type, create_by, create_time, update_by, update_time
+        SELECT id, record_date, record_time, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
+               location, position, position_id,
+               inspector_name, inspector_id, channel_no, passenger_name, id_card_no, flight_no, item_category, item_name,
+               item_quantity, item_weight, handling_method, result_handling, problem_type, rectification_measures,
+               problem_level, attachment, problem_category, personal_review, team_review, quality_officer,
+               quality_push_leader, operation_years, responsible_operation_age, send_to_relevant,
+               monthly_problem_count, last_month_problem_count, image_miss_difficulty, check_personnel,
+               dept_training_instructor, manage_qc_manager, team_internal_duty, remark, team_leader,
+               deduct_score, add_score, score_dimension, score_indicator, evidence_file, import_batch, source_type,
+               create_by, create_time, update_by, update_time
         FROM ledger_realtime_interception
         WHERE del_flag = '0'
     </sql>