ledger_exam_score字段删除和调整、相关代码调整、一键导入功能导入模版调整调整

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerTemplateController.java

@@ -123,7 +123,7 @@ public class LedgerTemplateController extends BaseController {
         nm.put("examScore", "成绩收集");
         hm.put("examScore", 2);
         cm.put("examScore", new String[]{
-            "类别","期数","考试人员","理论成绩","图像成绩","班组","分类","备注（补考分数）","队室教员"
+            "类别","期数","考试人员","理论成绩","图像成绩"
         });
 
         // 12. 小额奖励审批单（1行表头）

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

@@ -27,23 +27,21 @@ public class LedgerExamScore extends BaseEntity {
     @Excel(name = "部门名称")
     private String deptName;
 
-    @Excel(name = "队室/班组")
+    private Long deptId;
+
     private String teamName;
 
-    @Excel(name = "小组")
+    private Long teamId;
+
     private String groupName;
 
-    @Excel(name = "用户名称")
+    private Long groupId;
+
+    @Excel(name = "考试人员")
     private String personName;
 
     private Long personId;
 
-    private Long deptId;
-
-    private Long teamId;
-
-    private Long groupId;
-
     @Excel(name = "类别")
     private String examCategory;
 
@@ -56,15 +54,6 @@ 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;
-
     private String importBatch;
 
     @Excel(name = "数据来源")
@@ -82,15 +71,27 @@ public class LedgerExamScore 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 String getPersonName() { return personName; }
     public void setPersonName(String personName) { this.personName = personName; }
 
+    public Long getPersonId() { return personId; }
+    public void setPersonId(Long personId) { this.personId = personId; }
+
     public String getExamCategory() { return examCategory; }
     public void setExamCategory(String examCategory) { this.examCategory = examCategory; }
 
@@ -103,27 +104,6 @@ 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; }
 
@@ -132,4 +112,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

@@ -805,7 +805,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 11. 成绩收集 → ledger_exam_score
-     * R2: 类别(0) 期数(1) 考试人员(2) 理论成绩(3) 图像成绩(4) 班组(5) 分类(6) 备注(7)
+     * R2: 类别(0) 期数(1) 考试人员(2) 理论成绩(3) 图像成绩(4)
      */
     private int doExamScore(Sheet sheet, String batchNo, String username) {
         List<LedgerExamScore> list = new ArrayList<>();
@@ -813,11 +813,25 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             LedgerExamScore o = new LedgerExamScore();
             o.setExamCategory(str(c, 0));
             o.setExamPeriod(str(c, 1));
-            o.setPersonName(str(c, 2));
+            String personName = str(c, 2);
+            o.setPersonName(personName);
             o.setTheoryScore(decimal(c, 3));
             o.setImageScore(decimal(c, 4));
-            o.setTeamName(str(c, 5));
-            o.setRemark(str(c, 7));
+
+            // 根据姓名查找组织信息
+            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

@@ -6,20 +6,17 @@
         <id property="id" column="id" />
         <result property="examDate" column="exam_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="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="syncFlag" column="sync_flag" />
@@ -30,7 +27,9 @@
     </resultMap>
 
     <sql id="selectVo">
-        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
+        SELECT id, exam_date, dept_name, dept_id, team_name, team_id, group_name, group_id,
+               person_name, person_id, exam_category, exam_period, theory_score, image_score,
+               import_batch, source_type, sync_flag, create_by, create_time, update_by, update_time
         FROM ledger_exam_score
         WHERE del_flag = '0'
     </sql>
@@ -41,10 +40,10 @@
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</if>
         <if test="syncFlag != null and syncFlag != ''">AND sync_flag = #{syncFlag}</if>
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
-            AND (record_date &gt;= #{params.beginTime} OR approve_date &gt;= #{params.beginTime} OR exam_date &gt;= #{params.beginTime})
+            AND record_date &gt;= #{params.beginTime}
         </if>
         <if test="params != null and params.endTime != null and params.endTime != ''">
-            AND (record_date &lt;= #{params.endTime} OR approve_date &lt;= #{params.endTime} OR exam_date &lt;= #{params.endTime})
+            AND record_date &lt;= #{params.endTime}
         </if>
         ORDER BY id DESC
     </select>
@@ -54,4 +53,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>