mapper修改

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

@@ -777,39 +777,19 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 11. 成绩收集 → ledger_exam_score
-     * R2: 类别(0) 期数(1) 考试人员(2) 理论成绩(3) 图像成绩(4) 班组(5) 分类(6) 备注(7) 队室教员(8)
+     * R2: 类别(0) 期数(1) 考试人员(2) 理论成绩(3) 图像成绩(4) 班组(5) 分类(6) 备注(7)
      */
     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));           // 期数
-            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.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.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);

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

@@ -6,22 +6,33 @@
         <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="groupLeader" column="group_leader" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
         <result property="channelNo" column="channel_no" />
         <result property="totalCount" column="total_count" />
         <result property="passCount" column="pass_count" />
         <result property="passRate" column="pass_rate" />
         <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="updateBy" column="update_by" />
         <result property="updateTime" column="update_time" />
         <result property="syncFlag" column="sync_flag" />
+        <result property="responsibleId" column="responsible_id" />
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date,dept_name,team_name,channel_no,total_count,pass_count,pass_rate,remark,import_batch,source_type, create_by, create_time, update_by, update_time, sync_flag
+        SELECT id, record_date, dept_name, dept_id, team_name, team_id, group_name, group_id,
+               group_leader, team_internal_duty, channel_no, total_count, pass_count, pass_rate,
+               remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag,
+               responsible_id
         FROM ledger_channel_pass_rate
         WHERE del_flag = '0'
     </sql>
@@ -45,4 +56,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>

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

@@ -12,20 +12,36 @@
         <result property="passengerName" column="passenger_name" />
         <result property="complaintType" column="complaint_type" />
         <result property="complaintDesc" column="complaint_desc" />
+        <result property="passengerDemand" column="passenger_demand" />
+        <result property="channelSource" column="channel_source" />
+        <result property="isResponsible" column="is_responsible" />
+        <result property="responsibleCaptain" column="responsible_captain" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
         <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="updateBy" column="update_by" />
         <result property="updateTime" column="update_time" />
         <result property="syncFlag" column="sync_flag" />
+        <result property="responsibleId" column="responsible_id" />
+        <result property="deptId" column="dept_id" />
+        <result property="teamId" column="team_id" />
+        <result property="groupId" column="group_id" />
+        <result property="groupName" column="group_name" />
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date,dept_name,team_name,responsible_name,flight_no,passenger_name,complaint_type,complaint_desc,result_handling,deduct_score,evidence_file,remark,import_batch,source_type, create_by, create_time, update_by, update_time, sync_flag
+        SELECT id, record_date, dept_name, dept_id, team_name, team_id, group_name, group_id,
+               responsible_name, responsible_id, flight_no, passenger_name,
+               complaint_type, complaint_desc, passenger_demand, channel_source,
+               is_responsible, responsible_captain, team_internal_duty,
+               result_handling, deduct_score, evidence_file, remark,
+               import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_complaint
         WHERE del_flag = '0'
     </sql>
@@ -49,4 +65,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>