ledger_exam_score表字段添加、相关代码修改、导入逻辑修改

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

@@ -36,6 +36,14 @@ public class LedgerExamScore extends BaseEntity {
     @Excel(name = "用户名称")
     private String personName;
 
+    private Long personId;
+
+    private Long deptId;
+
+    private Long teamId;
+
+    private Long groupId;
+
     @Excel(name = "类别")
     private String examCategory;
 
@@ -48,6 +56,12 @@ public class LedgerExamScore extends BaseEntity {
     @Excel(name = "图像成绩")
     private BigDecimal imageScore;
 
+    @Excel(name = "分类")
+    private String classification;
+
+    @Excel(name = "队室教员")
+    private String teamInstructor;
+
     @Excel(name = "备注")
     private String remark;
 
@@ -89,9 +103,27 @@ public class LedgerExamScore extends BaseEntity {
     public BigDecimal getImageScore() { return imageScore; }
     public void setImageScore(BigDecimal imageScore) { this.imageScore = imageScore; }
 
+    public String getClassification() { return classification; }
+    public void setClassification(String classification) { this.classification = classification; }
+
+    public String getTeamInstructor() { return teamInstructor; }
+    public void setTeamInstructor(String teamInstructor) { this.teamInstructor = teamInstructor; }
+
     public String getRemark() { return remark; }
     public void setRemark(String remark) { this.remark = remark; }
 
+    public Long getPersonId() { return personId; }
+    public void setPersonId(Long personId) { this.personId = personId; }
+
+    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 String getImportBatch() { return importBatch; }
     public void setImportBatch(String importBatch) { this.importBatch = importBatch; }
 
@@ -100,4 +132,4 @@ public class LedgerExamScore extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
-}
+}

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

@@ -777,19 +777,39 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 11. 成绩收集 → ledger_exam_score
-     * R2: 类别(0) 期数(1) 考试人员(2) 理论成绩(3) 图像成绩(4) 班组(5) 分类(6) 备注(7)
+     * R2: 类别(0) 期数(1) 考试人员(2) 理论成绩(3) 图像成绩(4) 班组(5) 分类(6) 备注(7) 队室教员(8)
      */
     private int doExamScore(Sheet sheet, String batchNo, String username) {
         List<LedgerExamScore> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerExamScore o = new LedgerExamScore();
-            o.setExamCategory(str(c, 0));
-            o.setExamPeriod(str(c, 1));
-            o.setPersonName(str(c, 2));
-            o.setTheoryScore(decimal(c, 3));
-            o.setImageScore(decimal(c, 4));
-            o.setTeamName(str(c, 5));
-            o.setRemark(str(c, 7));
+            
+            // 按导入顺序映射字段
+            o.setExamCategory(str(c, 0));         // 类别
+            o.setExamPeriod(str(c, 1));           // 期数
+            String personName = str(c, 2);        // 考试人员
+            o.setPersonName(personName);
+            o.setTheoryScore(decimal(c, 3));      // 理论成绩
+            o.setImageScore(decimal(c, 4));       // 图像成绩
+            o.setTeamName(str(c, 5));             // 班组
+            o.setClassification(str(c, 6));       // 分类
+            o.setRemark(str(c, 7));               // 备注（补考分数）
+            o.setTeamInstructor(str(c, 8));       // 队室教员
+            
+            // 根据考试人员名称查找组织信息和ID
+            if (personName != null && !personName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
+                if (!orgInfo.isEmpty()) {
+                    o.setPersonId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
+                }
+            }
+            
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);

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

@@ -9,21 +9,28 @@
         <result property="teamName" column="team_name" />
         <result property="groupName" column="group_name" />
         <result property="personName" column="person_name" />
+        <result property="personId" column="person_id" />
+        <result property="deptId" column="dept_id" />
+        <result property="teamId" column="team_id" />
+        <result property="groupId" column="group_id" />
         <result property="examCategory" column="exam_category" />
         <result property="examPeriod" column="exam_period" />
         <result property="theoryScore" column="theory_score" />
         <result property="imageScore"  column="image_score"  />
+        <result property="classification" column="classification" />
+        <result property="teamInstructor" column="team_instructor" />
         <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="syncFlag" column="sync_flag" />
+        <result property="createBy"   column="create_by"   />
         <result property="createTime" column="create_time" />
         <result property="updateBy"   column="update_by"   />
         <result property="updateTime" column="update_time" />
-        <result property="syncFlag" column="sync_flag" />
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, exam_date, dept_name, team_name, group_name, person_name, exam_category, exam_period, theory_score, image_score, remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
+        SELECT id, exam_date, dept_name, team_name, group_name, person_name, person_id, dept_id, team_id, group_id, exam_category, exam_period, theory_score, image_score, classification, team_instructor, remark, import_batch, source_type, sync_flag, create_by, create_time, update_by, update_time
         FROM ledger_exam_score
         WHERE del_flag = '0'
     </sql>
@@ -47,4 +54,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>