Merge remote-tracking branch 'origin/master'

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

@@ -24,24 +24,44 @@ public class LedgerSecurityTest extends BaseEntity {
     @Excel(name = "测试日期", width = 20, dateFormat = "yyyy-MM-dd")
     private Date recordDate;
 
+    @Excel(name = "测试区域")
+    private String region;
+
+    @Excel(name = "测试通道")
+    private String channel;
+
     @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 testerName;
 
+    private Long testerId;
+
     @Excel(name = "被测人")
     private String testedName;
 
-    @Excel(name = "测试类型")
+    private Long testedId;
+
+    @Excel(name = "被测试岗位")
     private String testType;
 
+    private Long positionId;
+
     @Excel(name = "测试项目")
     private String testItem;
 
@@ -54,6 +74,27 @@ public class LedgerSecurityTest extends BaseEntity {
     @Excel(name = "处理结果")
     private String resultHandling;
 
+    @Excel(name = "复查地点及时间")
+    private String reviewLocationTime;
+
+    @Excel(name = "整改材料")
+    private String reviewMaterial;
+
+    @Excel(name = "推送队室质控员")
+    private String pushTeamQc;
+
+    @Excel(name = "推送质控队长")
+    private String pushQcCaptain;
+
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
+    @Excel(name = "点击推送至相关人员")
+    private String pushToRelevant;
+
+    @Excel(name = "队室负责人")
+    private String teamLeader;
+
     @Excel(name = "扣分")
     private BigDecimal deductScore;
 
@@ -136,4 +177,52 @@ public class LedgerSecurityTest extends BaseEntity {
 
     public String getSourceType() { return sourceType; }
     public void setSourceType(String sourceType) { this.sourceType = sourceType; }
+
+    public String getRegion() { return region; }
+    public void setRegion(String region) { this.region = region; }
+
+    public String getChannel() { return channel; }
+    public void setChannel(String channel) { this.channel = channel; }
+
+    public Long getDeptId() { return deptId; }
+    public void setDeptId(Long deptId) { this.deptId = deptId; }
+
+    public Long getTeamId() { return teamId; }
+    public void setTeamId(Long teamId) { this.teamId = teamId; }
+
+    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 Long getTesterId() { return testerId; }
+    public void setTesterId(Long testerId) { this.testerId = testerId; }
+
+    public Long getTestedId() { return testedId; }
+    public void setTestedId(Long testedId) { this.testedId = testedId; }
+
+    public Long getPositionId() { return positionId; }
+    public void setPositionId(Long positionId) { this.positionId = positionId; }
+
+    public String getReviewLocationTime() { return reviewLocationTime; }
+    public void setReviewLocationTime(String reviewLocationTime) { this.reviewLocationTime = reviewLocationTime; }
+
+    public String getReviewMaterial() { return reviewMaterial; }
+    public void setReviewMaterial(String reviewMaterial) { this.reviewMaterial = reviewMaterial; }
+
+    public String getPushTeamQc() { return pushTeamQc; }
+    public void setPushTeamQc(String pushTeamQc) { this.pushTeamQc = pushTeamQc; }
+
+    public String getPushQcCaptain() { return pushQcCaptain; }
+    public void setPushQcCaptain(String pushQcCaptain) { this.pushQcCaptain = pushQcCaptain; }
+
+    public String getTeamInternalDuty() { return teamInternalDuty; }
+    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+
+    public String getPushToRelevant() { return pushToRelevant; }
+    public void setPushToRelevant(String pushToRelevant) { this.pushToRelevant = pushToRelevant; }
+
+    public String getTeamLeader() { return teamLeader; }
+    public void setTeamLeader(String teamLeader) { this.teamLeader = teamLeader; }
 }

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

@@ -37,12 +37,16 @@ public class LedgerSeizureStats extends BaseEntity {
     @Excel(name = "工作区域")
     private String workArea;
 
+    private Long areaId;
+
     @Excel(name = "安检资格证书等级")
     private String qualificationLevel;
 
     @Excel(name = "岗位")
     private String position;
 
+    private Long positionId;
+
     @Excel(name = "小组")
     private String groupName;
 
@@ -154,12 +158,18 @@ public class LedgerSeizureStats extends BaseEntity {
     public String getWorkArea() { return workArea; }
     public void setWorkArea(String workArea) { this.workArea = workArea; }
 
+    public Long getAreaId() { return areaId; }
+    public void setAreaId(Long areaId) { this.areaId = areaId; }
+
     public String getQualificationLevel() { return qualificationLevel; }
     public void setQualificationLevel(String qualificationLevel) { this.qualificationLevel = qualificationLevel; }
 
     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 getGroupName() { return groupName; }
     public void setGroupName(String groupName) { this.groupName = groupName; }
 

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

@@ -27,21 +27,34 @@ public class LedgerSupervisionProblem 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 inspectorName;
 
     @Excel(name = "被查人")
     private String inspectedName;
 
+    private Long inspectedId;
+
     @Excel(name = "问题类型")
     private String problemType;
 
+    @Excel(name = "问题层级")
+    private String problemLevel;
+
     @Excel(name = "问题描述")
     private String problemDesc;
 
@@ -51,9 +64,57 @@ public class LedgerSupervisionProblem extends BaseEntity {
     @Excel(name = "通道号")
     private String channelNo;
 
+    @Excel(name = "岗位")
+    private String position;
+
+    private Long positionId;
+
     @Excel(name = "处理结果")
     private String resultHandling;
 
+    @Excel(name = "依据")
+    private String basis;
+
+    @Excel(name = "队室质控员")
+    private String qualityOfficer;
+
+    @Excel(name = "质控推送队室负责人")
+    private String qualityPushLeader;
+
+    @Excel(name = "整改情况")
+    private String rectificationStatus;
+
+    @Excel(name = "佐证材料")
+    private String evidenceMaterial;
+
+    @Excel(name = "发送至相关人员")
+    private String sendToRelevant;
+
+    @Excel(name = "本月内发生问题次数")
+    private Integer monthlyProblemCount;
+
+    @Excel(name = "上月质控问题超过三次人员")
+    private String lastMonthExceedThree;
+
+    @Excel(name = "检查人员")
+    private String checkPersonnel;
+
+    @Excel(name = "分管质控经理")
+    private String manageQcManager;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "录入时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date inputTime;
+
+    @Excel(name = "部门培训教员")
+    private String deptTrainingInstructor;
+
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
+    @Excel(name = "队室负责人")
+    private String teamLeader;
+
     @Excel(name = "扣分")
     private BigDecimal deductScore;
 
@@ -86,21 +147,39 @@ public class LedgerSupervisionProblem 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 getInspectorName() { return inspectorName; }
     public void setInspectorName(String inspectorName) { this.inspectorName = inspectorName; }
 
     public String getInspectedName() { return inspectedName; }
     public void setInspectedName(String inspectedName) { this.inspectedName = inspectedName; }
 
+    public Long getInspectedId() { return inspectedId; }
+    public void setInspectedId(Long inspectedId) { this.inspectedId = inspectedId; }
+
     public String getProblemType() { return problemType; }
     public void setProblemType(String problemType) { this.problemType = problemType; }
 
+    public String getProblemLevel() { return problemLevel; }
+    public void setProblemLevel(String problemLevel) { this.problemLevel = problemLevel; }
+
     public String getProblemDesc() { return problemDesc; }
     public void setProblemDesc(String problemDesc) { this.problemDesc = problemDesc; }
 
@@ -110,9 +189,57 @@ public class LedgerSupervisionProblem extends BaseEntity {
     public String getChannelNo() { return channelNo; }
     public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
 
+    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 getResultHandling() { return resultHandling; }
     public void setResultHandling(String resultHandling) { this.resultHandling = resultHandling; }
 
+    public String getBasis() { return basis; }
+    public void setBasis(String basis) { this.basis = basis; }
+
+    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 getRectificationStatus() { return rectificationStatus; }
+    public void setRectificationStatus(String rectificationStatus) { this.rectificationStatus = rectificationStatus; }
+
+    public String getEvidenceMaterial() { return evidenceMaterial; }
+    public void setEvidenceMaterial(String evidenceMaterial) { this.evidenceMaterial = evidenceMaterial; }
+
+    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 String getLastMonthExceedThree() { return lastMonthExceedThree; }
+    public void setLastMonthExceedThree(String lastMonthExceedThree) { this.lastMonthExceedThree = lastMonthExceedThree; }
+
+    public String getCheckPersonnel() { return checkPersonnel; }
+    public void setCheckPersonnel(String checkPersonnel) { this.checkPersonnel = checkPersonnel; }
+
+    public String getManageQcManager() { return manageQcManager; }
+    public void setManageQcManager(String manageQcManager) { this.manageQcManager = manageQcManager; }
+
+    public Date getInputTime() { return inputTime; }
+    public void setInputTime(Date inputTime) { this.inputTime = inputTime; }
+
+    public String getDeptTrainingInstructor() { return deptTrainingInstructor; }
+    public void setDeptTrainingInstructor(String deptTrainingInstructor) { this.deptTrainingInstructor = deptTrainingInstructor; }
+
+    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/domain/LedgerUnsafeEvent.java

@@ -24,18 +24,54 @@ public class LedgerUnsafeEvent extends BaseEntity {
     @Excel(name = "事件日期", width = 20, dateFormat = "yyyy-MM-dd")
     private Date recordDate;
 
+    @Excel(name = "航班号")
+    private String flightNo;
+
     @Excel(name = "部门名称")
     private String deptName;
 
     @Excel(name = "队室/班组")
     private String teamName;
 
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
+    @Excel(name = "小组")
+    private String groupName;
+
+    private Long groupId;
+
+    private Long deptId;
+
+    private Long teamId;
+
     @Excel(name = "责任人")
     private String responsibleName;
 
+    private Long responsibleId;
+
     @Excel(name = "事件类型")
     private String eventType;
 
+    @Excel(name = "涉及物品")
+    private String involvedItems;
+
+    @Excel(name = "岗位")
+    private String position;
+
+    private Long positionId;
+
+    @Excel(name = "区域")
+    private String area;
+
+    private Long areaId;
+
+    @Excel(name = "通道号")
+    private String channelNo;
+
+    @Excel(name = "图像")
+    private String image;
+
     @Excel(name = "事件描述")
     private String eventDesc;
 
@@ -62,18 +98,60 @@ public class LedgerUnsafeEvent extends BaseEntity {
     public Date getRecordDate() { return recordDate; }
     public void setRecordDate(Date recordDate) { this.recordDate = recordDate; }
 
+    public String getFlightNo() { return flightNo; }
+    public void setFlightNo(String flightNo) { this.flightNo = flightNo; }
+
     public String getDeptName() { return deptName; }
     public void setDeptName(String deptName) { this.deptName = deptName; }
 
     public String getTeamName() { return teamName; }
     public void setTeamName(String teamName) { this.teamName = teamName; }
 
+    public String getTeamInternalDuty() { return teamInternalDuty; }
+    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+
+    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 getDeptId() { return deptId; }
+    public void setDeptId(Long deptId) { this.deptId = deptId; }
+
+    public Long getTeamId() { return teamId; }
+    public void setTeamId(Long teamId) { this.teamId = teamId; }
+
     public String getResponsibleName() { return responsibleName; }
     public void setResponsibleName(String responsibleName) { this.responsibleName = responsibleName; }
 
+    public Long getResponsibleId() { return responsibleId; }
+    public void setResponsibleId(Long responsibleId) { this.responsibleId = responsibleId; }
+
     public String getEventType() { return eventType; }
     public void setEventType(String eventType) { this.eventType = eventType; }
 
+    public String getInvolvedItems() { return involvedItems; }
+    public void setInvolvedItems(String involvedItems) { this.involvedItems = involvedItems; }
+
+    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 getArea() { return area; }
+    public void setArea(String area) { this.area = area; }
+
+    public Long getAreaId() { return areaId; }
+    public void setAreaId(Long areaId) { this.areaId = areaId; }
+
+    public String getChannelNo() { return channelNo; }
+    public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
+
+    public String getImage() { return image; }
+    public void setImage(String image) { this.image = image; }
+
     public String getEventDesc() { return eventDesc; }
     public void setEventDesc(String eventDesc) { this.eventDesc = eventDesc; }
 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.system.domain.SysPost;
+import com.sundot.airport.system.domain.BasePosition;
 import com.sundot.airport.ledger.domain.*;
 import com.sundot.airport.ledger.domain.LedgerDailyTraining;
 import com.sundot.airport.ledger.domain.LedgerLeaderDuty;
@@ -18,6 +20,8 @@ import com.sundot.airport.ledger.service.ILedgerDormFireSafetyService;
 import com.sundot.airport.ledger.service.ILedgerTrainingIssueService;
 import com.sundot.airport.system.mapper.SysDeptMapper;
 import com.sundot.airport.system.mapper.SysUserMapper;
+import com.sundot.airport.system.mapper.SysPostMapper;
+import com.sundot.airport.system.mapper.BasePositionMapper;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,6 +64,8 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     @Autowired private IScoreEventService scoreEventService;
     @Autowired private SysUserMapper sysUserMapper;
     @Autowired private SysDeptMapper sysDeptMapper;
+    @Autowired private SysPostMapper sysPostMapper;
+    @Autowired private BasePositionMapper basePositionMapper;
 
     // 导入缓存（在导入开始时构建，导入结束后释放）
     private ImportCache importCache;
@@ -156,25 +162,77 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     // ════════════════════════════════════════════════════════════════
 
     /** 1. 部门监察问题记录表 → ledger_supervision_problem
-     * R2: 时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 问题描述(5)
-     *     问题类型(6) 整改措施(7) 依据(8) 问题层级(9) 班组(10)
-     *     队室质控员(11) ... 附件(13)
+     * 导入顺序：时间(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)
      */
     private int doSupervisionProblem(Sheet sheet, String batchNo, String username) {
         List<LedgerSupervisionProblem> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerSupervisionProblem o = new LedgerSupervisionProblem();
-            o.setRecordDate(date(c, 0));
-            o.setLocation(str(c, 1));
-            o.setChannelNo(str(c, 2));
-            o.setInspectedName(str(c, 4));
-            o.setProblemDesc(str(c, 5));
-            o.setProblemType(str(c, 6));
-            o.setResultHandling(str(c, 7));
-            o.setRemark(str(c, 8));
-            o.setTeamName(str(c, 10));
-            o.setInspectorName(str(c, 11));
-            o.setEvidenceFile(str(c, 13));
+            
+            // 按导入顺序映射字段
+            o.setRecordDate(date(c, 0));        // 时间
+            o.setLocation(str(c, 1));           // 区域
+            o.setChannelNo(str(c, 2));          // 工作点
+            o.setPosition(str(c, 3));           // 岗位
+            String inspectedName = str(c, 4);   // 责任人
+            o.setInspectedName(inspectedName);
+            o.setProblemDesc(str(c, 5));        // 问题描述
+            o.setProblemType(str(c, 6));        // 问题类型
+            o.setResultHandling(str(c, 7));     // 整改措施
+            o.setBasis(str(c, 8));              // 依据
+            o.setProblemLevel(str(c, 9));       // 问题层级
+            o.setTeamName(str(c, 10));          // 班组
+            o.setQualityOfficer(str(c, 11));    // 队室质控员
+            o.setQualityPushLeader(str(c, 12)); // 质控推送队室负责人
+            o.setEvidenceFile(str(c, 13));      // 附件
+            o.setRectificationStatus(str(c, 14)); // 整改情况
+            o.setEvidenceMaterial(str(c, 15));  // 佐证材料
+            o.setSendToRelevant(str(c, 16));    // 发送至相关人员
+            o.setMonthlyProblemCount(integer(c, 17)); // 本月内发生问题次数
+            o.setLastMonthExceedThree(str(c, 18)); // 上月质控问题超过三次人员
+            o.setCheckPersonnel(str(c, 19));    // 检查人员
+            o.setManageQcManager(str(c, 20));   // 分管质控经理
+            o.setInputTime(date(c, 21));        // 录入时间
+            o.setDeptTrainingInstructor(str(c, 22)); // 部门培训教员
+            o.setTeamInternalDuty(str(c, 23));  // 队室内勤
+            o.setTeamLeader(str(c, 24));        // 队室负责人
+            
+            // 根据责任人名称查找组织ID
+            if (inspectedName != null && !inspectedName.trim().isEmpty()) {
+                Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
+                if (!orgInfo.isEmpty()) {
+                    o.setInspectedId(orgInfo.get("userId"));
+                    o.setDeptId(orgInfo.get("deptId"));
+                    o.setTeamId(orgInfo.get("teamId"));
+                    o.setGroupId(orgInfo.get("groupId"));
+                }
+            }
+            
+            // 根据岗位和区域查找对应ID
+            if (importCache != null) {
+                // 岗位ID
+                String positionName = o.getPosition();
+                if (positionName != null && !positionName.trim().isEmpty()) {
+                    Long positionId = importCache.getPositionIdByName(positionName.trim());
+                    if (positionId != null) {
+                        o.setPositionId(positionId);
+                    }
+                }
+                
+                // 区域ID
+                String areaName = o.getLocation();
+                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);
@@ -296,28 +354,99 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 6. 安保测试记录表（部门）→ ledger_security_test
-     * R2: 时间(0) 区域→deptName(1) 通道→groupName(2) 测试项目(3) 被测人员(4) 被测岗位→testType(5)
-     *     测试物品→problemDesc(6) 图片→evidenceFile(7) 是否通过→testResult(8) 层级→scoreIndicator(9)
-     *     整改措施→resultHandling(10) 扣分(11) 整改材料→remark(12) 班组(13)
+     * 导入顺序：开展时间(0) 测试区域(1) 测试通道(2) 测试项目(3) 被测试人员(4) 被测试岗位(5)
+     *          测试物品(6) 开展项目图片或视频(7) 是否通过(8) 层级(9) 整改措施(10)
+     *          复查地点及时间(11) 整改材料(12) 班组(13) 推送队室质控员(14) 推送质控队长(15)
+     *          队室内勤(16) 点击推送至相关人员(17) 队室负责人(18)
      */
     private int doSecurityTest(Sheet sheet, String batchNo, String username) {
         List<LedgerSecurityTest> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerSecurityTest o = new LedgerSecurityTest();
-            o.setRecordDate(date(c, 0));
-            o.setDeptName(str(c, 1));
-            o.setGroupName(str(c, 2));
-            o.setTestItem(str(c, 3));
-            o.setTestedName(str(c, 4));
+            
+            // 按照新的导入顺序映射字段
+            o.setRecordDate(date(c, 0));  // 开展时间
+            o.setRegion(str(c, 1));       // 测试区域
+            o.setChannel(str(c, 2));      // 测试通道
+            o.setTestItem(str(c, 3));     // 测试项目
+            
+            // 被测试人员
+            String testedName = str(c, 4);
+            o.setTestedName(testedName);
+            
+            // 被测试岗位
             o.setTestType(str(c, 5));
+            
+            // 测试物品→problemDesc
             o.setProblemDesc(str(c, 6));
+            
+            // 开展项目图片或视频→evidenceFile
             o.setEvidenceFile(str(c, 7));
+            
+            // 是否通过→testResult
             o.setTestResult(str(c, 8));
+            
+            // 层级→scoreIndicator
             o.setScoreIndicator(str(c, 9));
+            
+            // 整改措施→resultHandling
             o.setResultHandling(str(c, 10));
-            o.setDeductScore(decimal(c, 11));
-            o.setRemark(str(c, 12));
-            o.setTeamName(str(c, 13));
+            
+            // 复查地点及时间
+            o.setReviewLocationTime(str(c, 11));
+            
+            // 整改材料
+            o.setReviewMaterial(str(c, 12));
+            
+            // 班组→teamName
+            String teamName = str(c, 13);
+            o.setTeamName(teamName);
+            
+            // 推送队室质控员
+            o.setPushTeamQc(str(c, 14));
+            
+            // 推送质控队长
+            o.setPushQcCaptain(str(c, 15));
+            
+            // 队室内勤
+            o.setTeamInternalDuty(str(c, 16));
+            
+            // 点击推送至相关人员
+            o.setPushToRelevant(str(c, 17));
+            
+            // 队室负责人
+            o.setTeamLeader(str(c, 18));
+            
+            // 使用缓存查找组织信息（根据被测人名称）
+            if (testedName != null && !testedName.trim().isEmpty()) {
+                Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(testedName);
+                if (!orgInfo.isEmpty()) {
+                    o.setTestedId(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, 5);  // 被测试岗位
+                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);
@@ -390,10 +519,44 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setRecordDate(date(c, 0));
             o.setEventDesc(str(c, 1));
             o.setEventType(str(c, 2));
-            o.setResponsibleName(str(c, 4));
+            o.setFlightNo(str(c, 3));
+            String responsibleName = str(c, 4);
+            o.setResponsibleName(responsibleName);
             o.setTeamName(str(c, 5));
-            o.setEvidenceFile(str(c, 10));
-            o.setRemark(str(c, 8));
+            o.setInvolvedItems(str(c, 6));
+            o.setPosition(str(c, 7));
+            o.setArea(str(c, 8));
+            o.setChannelNo(str(c, 9));
+            o.setImage(str(c, 10));
+            
+            // 使用缓存查找组织信息
+            Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(responsibleName);
+            if (!orgInfo.isEmpty()) {
+                o.setResponsibleId(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, 7);
+                if (positionName != null && !positionName.trim().isEmpty()) {
+                    Long positionId = importCache.getPositionIdByName(positionName.trim());
+                    if (positionId != null) {
+                        o.setPositionId(positionId);
+                    }
+                }
+                
+                String areaName = str(c, 8);
+                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);
@@ -448,6 +611,25 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                 o.setTeamId(orgInfo.get("teamId"));
                 o.setGroupId(orgInfo.get("groupId"));
             }
+            
+            // 根据岗位名称和工作区域名称查找ID
+            if (importCache != null) {
+                String positionName = str(c, 7);
+                if (positionName != null && !positionName.trim().isEmpty()) {
+                    Long positionId = importCache.getPositionIdByName(positionName.trim());
+                    if (positionId != null) {
+                        o.setPositionId(positionId);
+                    }
+                }
+                
+                String areaName = str(c, 4);
+                if (areaName != null && !areaName.trim().isEmpty()) {
+                    Long areaId = importCache.getAreaIdByName(areaName.trim());
+                    if (areaId != null) {
+                        o.setAreaId(areaId);
+                    }
+                }
+            }
                 
             o.setImportBatch(batchNo);
             o.setSourceType("1");
@@ -920,10 +1102,15 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     private static class ImportCache {
         private final Map<String, SysUser> userCache;      // Map<昵称, 用户>
         private final Map<Long, SysDept> deptCache;        // Map<部门ID, 部门>
+        private final Map<String, Long> positionCache;     // Map<岗位名称, 岗位ID>
+        private final Map<String, Long> areaCache;         // Map<区域名称, 区域ID>
 
-        public ImportCache(Map<String, SysUser> userCache, Map<Long, SysDept> deptCache) {
+        public ImportCache(Map<String, SysUser> userCache, Map<Long, SysDept> deptCache,
+                          Map<String, Long> positionCache, Map<String, Long> areaCache) {
             this.userCache = userCache;
             this.deptCache = deptCache;
+            this.positionCache = positionCache;
+            this.areaCache = areaCache;
         }
 
         public SysUser getUserByNickName(String nickName) {
@@ -933,6 +1120,14 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         public SysDept getDeptById(Long deptId) {
             return deptCache.get(deptId);
         }
+
+        public Long getPositionIdByName(String positionName) {
+            return positionCache.get(positionName);
+        }
+
+        public Long getAreaIdByName(String areaName) {
+            return areaCache.get(areaName);
+        }
     }
 
     // ════════════════════════════════════════════════════════════════
@@ -1019,8 +1214,33 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             }
         }
 
+        // 构建岗位缓存：Map<岗位名称, 岗位ID>
+        Map<String, Long> positionCache = new HashMap<>();
+        List<SysPost> allPosts = sysPostMapper.selectPostAll();
+        if (allPosts != null) {
+            for (SysPost post : allPosts) {
+                if (post.getPostName() != null && !post.getPostName().trim().isEmpty()) {
+                    positionCache.put(post.getPostName().trim(), post.getPostId());
+                }
+            }
+        }
+
+        // 构建区域缓存：Map<区域名称, 区域ID>
+        // 从base_position表查询position_type='REGIONAL'的区域
+        Map<String, Long> areaCache = new HashMap<>();
+        BasePosition queryPosition = new BasePosition();
+        queryPosition.setPositionType("REGIONAL");
+        List<BasePosition> allAreas = basePositionMapper.selectBasePositionList(queryPosition);
+        if (allAreas != null) {
+            for (BasePosition area : allAreas) {
+                if (area.getName() != null && !area.getName().trim().isEmpty()) {
+                    areaCache.put(area.getName().trim(), area.getId());
+                }
+            }
+        }
+
         // 创建统一缓存对象
-        this.importCache = new ImportCache(userCache, deptCache);
+        this.importCache = new ImportCache(userCache, deptCache, positionCache, areaCache);
     }
 
     /**

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

@@ -182,8 +182,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             String src = "supervision_problem:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getInspectedName())) { skip++; continue; }
-            // 按问题层级选取L3指标和默认分值
-            String level = row.getProblemType() != null ? row.getProblemType() : "";
+            // 按问题层级选取L3指标和默认分值（修正：取problemLevel字段）
+            String level = row.getProblemLevel() != null ? row.getProblemLevel() : "";
             long l3Id; BigDecimal defaultSv;
             if (level.contains("上级")) { l3Id = IND_SUPERVISION_L3_LEADER; defaultSv = BigDecimal.valueOf(-1.20); }
             else if (level.contains("部门")) { l3Id = IND_SUPERVISION_L3_DEPT; defaultSv = BigDecimal.valueOf(-0.80); }
@@ -234,7 +234,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             if (existsBySrc(src)) { skip++; continue; }
             if (!"未通过".equals(row.getTestResult())) { skip++; continue; }
             if (!hasName(row.getTestedName())) { skip++; continue; }
-            String level = row.getTestType() != null ? row.getTestType() : "";
+            // 取层级字段（scoreIndicator），而不是testType
+            String level = row.getScoreIndicator() != null ? row.getScoreIndicator() : "";
             long l3Id;
             if (level.contains("局方")) { l3Id = IND_SECTEST_L3_GOV; }
             else if (level.contains("公司")) { l3Id = IND_SECTEST_L3_CORP; }

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

@@ -5,16 +5,32 @@
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerSecurityTest">
         <id property="id" column="id" />
         <result property="recordDate" column="record_date" />
+        <result property="region" column="region" />
+        <result property="channel" column="channel" />
         <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="testerName" column="tester_name" />
+        <result property="testerId" column="tester_id" />
         <result property="testedName" column="tested_name" />
+        <result property="testedId" column="tested_id" />
         <result property="testType" column="test_type" />
+        <result property="positionId" column="position_id" />
         <result property="testItem" column="test_item" />
         <result property="testResult" column="test_result" />
         <result property="problemDesc" column="problem_desc" />
         <result property="resultHandling" column="result_handling" />
+        <result property="reviewLocationTime" column="review_location_time" />
+        <result property="reviewMaterial" column="review_material" />
+        <result property="pushTeamQc" column="push_team_qc" />
+        <result property="pushQcCaptain" column="push_qc_captain" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
+        <result property="pushToRelevant" column="push_to_relevant" />
+        <result property="teamLeader" column="team_leader" />
         <result property="deductScore" column="deduct_score" />
         <result property="addScore" column="add_score" />
         <result property="scoreDimension" column="score_dimension" />
@@ -22,14 +38,19 @@
         <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,tester_name,tested_name,test_type,test_item,test_result,problem_desc,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, region, channel, 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,
+               problem_desc, result_handling, review_location_time, review_material, push_team_qc, push_qc_captain,
+               team_internal_duty, push_to_relevant, team_leader, deduct_score, add_score, score_dimension,
+               score_indicator, evidence_file, remark, import_batch, source_type, create_by, create_time, update_by, update_time
         FROM ledger_security_test
         WHERE del_flag = '0'
     </sql>

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

@@ -6,15 +6,37 @@
         <id     property="id"               column="id"               />
         <result property="recordDate"       column="record_date"      />
         <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="inspectorName"    column="inspector_name"   />
         <result property="inspectedName"    column="inspected_name"   />
+        <result property="inspectedId"      column="inspected_id"     />
         <result property="problemType"      column="problem_type"     />
+        <result property="problemLevel"     column="problem_level"    />
         <result property="problemDesc"      column="problem_desc"     />
         <result property="location"         column="location"         />
         <result property="channelNo"        column="channel_no"       />
+        <result property="position"         column="position"         />
+        <result property="positionId"       column="position_id"      />
         <result property="resultHandling"   column="result_handling"  />
+        <result property="basis"            column="basis"            />
+        <result property="qualityOfficer"   column="quality_officer"  />
+        <result property="qualityPushLeader" column="quality_push_leader" />
+        <result property="rectificationStatus" column="rectification_status" />
+        <result property="evidenceMaterial" column="evidence_material" />
+        <result property="sendToRelevant"   column="send_to_relevant" />
+        <result property="monthlyProblemCount" column="monthly_problem_count" />
+        <result property="lastMonthExceedThree" column="last_month_exceed_three" />
+        <result property="checkPersonnel"   column="check_personnel"  />
+        <result property="manageQcManager"  column="manage_qc_manager" />
+        <result property="inputTime"        column="input_time"       />
+        <result property="deptTrainingInstructor" column="dept_training_instructor" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
+        <result property="teamLeader"       column="team_leader"      />
         <result property="deductScore"      column="deduct_score"     />
         <result property="addScore"         column="add_score"        />
         <result property="scoreDimension"   column="score_dimension"  />
@@ -30,10 +52,12 @@
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date, dept_name, team_name, group_name,
-               inspector_name, inspected_name, problem_type, problem_desc, location,
-               channel_no, result_handling, deduct_score, add_score,
-               score_dimension, score_indicator, evidence_file, remark,
+        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, quality_officer, quality_push_leader,
+               rectification_status, evidence_material, send_to_relevant, monthly_problem_count, last_month_exceed_three,
+               check_personnel, manage_qc_manager, input_time, dept_training_instructor, team_internal_duty, team_leader,
+               deduct_score, add_score, score_dimension, score_indicator, evidence_file, remark,
                import_batch, source_type, create_by, create_time, update_by, update_time
         FROM ledger_supervision_problem
         WHERE del_flag = '0'

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

@@ -5,24 +5,39 @@
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerUnsafeEvent">
         <id property="id" column="id" />
         <result property="recordDate" column="record_date" />
+        <result property="flightNo" column="flight_no" />
         <result property="deptName" column="dept_name" />
+        <result property="deptId" column="dept_id" />
         <result property="teamName" column="team_name" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
+        <result property="teamId" column="team_id" />
+        <result property="groupName" column="group_name" />
+        <result property="groupId" column="group_id" />
         <result property="responsibleName" column="responsible_name" />
+        <result property="responsibleId" column="responsible_id" />
         <result property="eventType" column="event_type" />
+        <result property="involvedItems" column="involved_items" />
+        <result property="position" column="position" />
+        <result property="positionId" column="position_id" />
+        <result property="area" column="area" />
+        <result property="areaId" column="area_id" />
+        <result property="channelNo" column="channel_no" />
+        <result property="image" column="image" />
         <result property="eventDesc" column="event_desc" />
         <result property="resultHandling" column="result_handling" />
         <result property="deductScore" column="deduct_score" />
         <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,responsible_name,event_type,event_desc,result_handling,deduct_score,evidence_file,remark,import_batch,source_type, create_by, create_time, update_by, update_time
+        SELECT id, record_date, flight_no, dept_name, dept_id, team_name, team_internal_duty, 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, result_handling, deduct_score, evidence_file, remark, import_batch, source_type, create_by, create_time, update_by, update_time
         FROM ledger_unsafe_event
         WHERE del_flag = '0'
     </sql>