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

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

@@ -59,13 +59,11 @@ public class LedgerChannelPassRate extends BaseEntity {
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
-    // ID字段
+   // 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; }
@@ -119,12 +117,6 @@ public class LedgerChannelPassRate extends BaseEntity {
     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; }
 

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

@@ -45,6 +45,21 @@ public class LedgerComplaint extends BaseEntity {
     @Excel(name = "投诉内容")
     private String complaintDesc;
 
+    @Excel(name = "旅客诉求")
+    private String passengerDemand;
+
+    @Excel(name = "渠道来源")
+    private String channelSource;
+
+    @Excel(name = "是否有责")
+    private String isResponsible;
+
+    @Excel(name = "责任队长")
+    private String responsibleCaptain;
+
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
     @Excel(name = "处理结果")
     private String resultHandling;
 
@@ -65,6 +80,13 @@ public class LedgerComplaint extends BaseEntity {
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
+    // ID字段
+    private Long responsibleId;
+    private Long deptId;
+    private Long teamId;
+    private Long groupId;
+    private String groupName;
+
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
 
@@ -92,6 +114,21 @@ public class LedgerComplaint extends BaseEntity {
     public String getComplaintDesc() { return complaintDesc; }
     public void setComplaintDesc(String complaintDesc) { this.complaintDesc = complaintDesc; }
 
+    public String getPassengerDemand() { return passengerDemand; }
+    public void setPassengerDemand(String passengerDemand) { this.passengerDemand = passengerDemand; }
+
+    public String getChannelSource() { return channelSource; }
+    public void setChannelSource(String channelSource) { this.channelSource = channelSource; }
+
+    public String getIsResponsible() { return isResponsible; }
+    public void setIsResponsible(String isResponsible) { this.isResponsible = isResponsible; }
+
+    public String getResponsibleCaptain() { return responsibleCaptain; }
+    public void setResponsibleCaptain(String responsibleCaptain) { this.responsibleCaptain = responsibleCaptain; }
+
+    public String getTeamInternalDuty() { return teamInternalDuty; }
+    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+
     public String getResultHandling() { return resultHandling; }
     public void setResultHandling(String resultHandling) { this.resultHandling = resultHandling; }
 
@@ -112,4 +149,19 @@ public class LedgerComplaint 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 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

@@ -390,21 +390,43 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     /** 5. 投诉情况 → ledger_complaint
      * R2: 时间(0) 航班号(1) 旅客姓名(2) 班组(3) 责任人(4)
      *     投诉情况(5) 旅客诉求(6) 类别(7) 渠道来源(8) 是否有责(9)
-     *     处理进度(10)
+     *     处理进度(10) 责任队长(11) 队室内勤(12)
      */
     private int doComplaint(Sheet sheet, String batchNo, String username) {
         List<LedgerComplaint> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerComplaint o = new LedgerComplaint();
-            o.setRecordDate(date(c, 0));
-            o.setFlightNo(str(c, 1));
-            o.setPassengerName(str(c, 2));
-            o.setTeamName(str(c, 3));
-            o.setResponsibleName(str(c, 4));
-            o.setComplaintDesc(str(c, 5));
-            o.setComplaintType(str(c, 7));
-            o.setResultHandling(str(c, 10));
-            o.setRemark(str(c, 8));
+            
+            // 按导入顺序映射字段
+            o.setRecordDate(date(c, 0));           // 时间
+            o.setFlightNo(str(c, 1));              // 航班号
+            o.setPassengerName(str(c, 2));         // 旅客姓名
+            o.setTeamName(str(c, 3));              // 班组
+            String responsibleName = str(c, 4);    // 责任人
+            o.setResponsibleName(responsibleName);
+            o.setComplaintDesc(str(c, 5));         // 投诉情况
+            o.setPassengerDemand(str(c, 6));       // 旅客诉求
+            o.setComplaintType(str(c, 7));         // 类别
+            o.setChannelSource(str(c, 8));         // 渠道来源
+            o.setIsResponsible(str(c, 9));         // 是否有责
+            o.setResultHandling(str(c, 10));       // 处理进度
+            o.setResponsibleCaptain(str(c, 11));   // 责任队长
+            o.setTeamInternalDuty(str(c, 12));     // 队室内勤
+            
+            // 根据责任人名称查找组织信息和ID
+            if (responsibleName != null && !responsibleName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(responsibleName);
+                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"));
+                }
+            }
+            
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);