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

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/service/impl/LedgerCombinedImportServiceImpl.java

@@ -302,28 +302,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);

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

@@ -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>