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

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

@@ -30,6 +30,12 @@ public class LedgerChannelPassRate extends BaseEntity {
     @Excel(name = "队室/班组")
     private String teamName;
 
+    @Excel(name = "组长")
+    private String groupLeader;
+
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
     @Excel(name = "通道号")
     private String channelNo;
 
@@ -53,18 +59,30 @@ public class LedgerChannelPassRate extends BaseEntity {
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
+    // ID字段
+    private Long responsibleId;
+    private Long deptId;
+    private Long teamId;
+    private Long groupId;
+    private Long positionId;
+    private Long areaId;
+    private String groupName;
+
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
 
     public Date getRecordDate() { return recordDate; }
     public void setRecordDate(Date recordDate) { this.recordDate = recordDate; }
 
-    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 getGroupLeader() { return groupLeader; }
+    public void setGroupLeader(String groupLeader) { this.groupLeader = groupLeader; }
+
+    public String getTeamInternalDuty() { return teamInternalDuty; }
+    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+
     public String getChannelNo() { return channelNo; }
     public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
 
@@ -88,4 +106,28 @@ public class LedgerChannelPassRate extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
-}
+
+    public Long getResponsibleId() { return responsibleId; }
+    public void setResponsibleId(Long responsibleId) { this.responsibleId = responsibleId; }
+
+    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 getPositionId() { return positionId; }
+    public void setPositionId(Long positionId) { this.positionId = positionId; }
+
+    public Long getAreaId() { return areaId; }
+    public void setAreaId(Long areaId) { this.areaId = areaId; }
+
+    public String getDeptName() { return deptName; }
+    public void setDeptName(String deptName) { this.deptName = deptName; }
+
+    public String getGroupName() { return groupName; }
+    public void setGroupName(String groupName) { this.groupName = groupName; }
+}

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

@@ -522,7 +522,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
     /** 7. 通道过检率（pivot表）→ ledger_channel_pass_rate
      * R1: 大标题行
-     * R2: 组长(0) 班组(1) 内勤(2) 2026年1月平均过检率(3) 2026年2月...(4) ...
+     * R2: 组长(0) 班组(1) 队室内勤(2) 2026年1月平均过检率(3) 2026年2月...(4) ...
      * 每行展开为多条（每月一条）
      */
     private int doChannelPassRate(Sheet sheet, String batchNo, String username) {
@@ -550,13 +550,24 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
         List<LedgerChannelPassRate> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
-            String teamName = str(c, 1);
+            String groupLeader = str(c, 0);      // 组长(0)
+            String teamName = str(c, 1);         // 班组(1)
+            String teamInternalDuty = str(c, 2); // 队室内勤(2)
+            
+            // 根据组长名称查找组织信息和ID
+            Map<String, Object> orgInfo = new HashMap<>();
+            if (groupLeader != null && !groupLeader.trim().isEmpty()) {
+                orgInfo = resolveOrgInfoByNameWithCache(groupLeader);
+            }
+            
             for (int[] mc : monthCols) {
                 int ci = mc[0];
                 BigDecimal rate = decimal(c, ci);
                 if (rate == null) continue;
                 LedgerChannelPassRate o = new LedgerChannelPassRate();
+                o.setGroupLeader(groupLeader);
                 o.setTeamName(teamName);
+                o.setTeamInternalDuty(teamInternalDuty);
                 o.setPassRate(rate);
                 // 用时间戳还原日期
                 Calendar cal = Calendar.getInstance();
@@ -565,6 +576,18 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                 o.setImportBatch(batchNo);
                 o.setSourceType("1");
                 o.setCreateBy(username);
+                
+                // 设置组织ID和名称
+                if (!orgInfo.isEmpty()) {
+                    o.setResponsibleId((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"));
+                }
+                
                 list.add(o);
             }
         }