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

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

@@ -72,8 +72,8 @@ public class LedgerTemplateController extends BaseController {
         nm.put("complaint", "投诉情况");
         hm.put("complaint", 2);
         cm.put("complaint", new String[]{
-            "时间","航班号","旅客姓名","班组","责任人","投诉情况","旅客诉求","类别","渠道来源",
-            "是否有责","处理进度","责任队长","队室内勤"
+            "时间","航班号","旅客姓名","责任人","投诉情况","旅客诉求","类别","渠道来源",
+            "是否有责","处理进度"
         });
 
         // 6. 安保测试记录表（部门）(19列)

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

@@ -21,28 +21,37 @@ public class LedgerComplaint extends BaseEntity {
     private Long id;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "记录日期", width = 20, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd")
     private Date recordDate;
 
     @Excel(name = "部门名称")
     private String deptName;
 
-    @Excel(name = "队室/班组")
+    private Long deptId;
+
     private String teamName;
 
+    private Long teamId;
+
+    private String groupName;
+
+    private Long groupId;
+
     @Excel(name = "责任人")
     private String responsibleName;
 
+    private Long responsibleId;
+
     @Excel(name = "航班号")
     private String flightNo;
 
     @Excel(name = "旅客姓名")
     private String passengerName;
 
-    @Excel(name = "投诉类型")
+    @Excel(name = "类别")
     private String complaintType;
 
-    @Excel(name = "投诉内容")
+    @Excel(name = "投诉情况")
     private String complaintDesc;
 
     @Excel(name = "旅客诉求")
@@ -54,13 +63,7 @@ public class LedgerComplaint extends BaseEntity {
     @Excel(name = "是否有责")
     private String isResponsible;
 
-    @Excel(name = "责任队长")
-    private String responsibleCaptain;
-
-    @Excel(name = "队室内勤")
-    private String teamInternalDuty;
-
-    @Excel(name = "处理结果")
+    @Excel(name = "处理进度")
     private String resultHandling;
 
     @Excel(name = "扣分")
@@ -69,9 +72,6 @@ public class LedgerComplaint extends BaseEntity {
     @Excel(name = "佐证附件")
     private String evidenceFile;
 
-    @Excel(name = "备注")
-    private String remark;
-
     private String importBatch;
 
     @Excel(name = "数据来源")
@@ -80,13 +80,6 @@ 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; }
 
@@ -96,12 +89,27 @@ public class LedgerComplaint 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 getResponsibleName() { return responsibleName; }
     public void setResponsibleName(String responsibleName) { this.responsibleName = responsibleName; }
 
+    public Long getResponsibleId() { return responsibleId; }
+    public void setResponsibleId(Long responsibleId) { this.responsibleId = responsibleId; }
+
     public String getFlightNo() { return flightNo; }
     public void setFlightNo(String flightNo) { this.flightNo = flightNo; }
 
@@ -123,12 +131,6 @@ public class LedgerComplaint extends BaseEntity {
     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; }
 
@@ -138,9 +140,6 @@ public class LedgerComplaint extends BaseEntity {
     public String getEvidenceFile() { return evidenceFile; }
     public void setEvidenceFile(String evidenceFile) { this.evidenceFile = evidenceFile; }
 
-    public String getRemark() { return remark; }
-    public void setRemark(String remark) { this.remark = remark; }
-
     public String getImportBatch() { return importBatch; }
     public void setImportBatch(String importBatch) { this.importBatch = importBatch; }
 
@@ -149,19 +148,4 @@ 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

@@ -443,31 +443,26 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 5. 投诉情况 → ledger_complaint
-     * R2: 时间(0) 航班号(1) 旅客姓名(2) 班组(3) 责任人(4)
-     *     投诉情况(5) 旅客诉求(6) 类别(7) 渠道来源(8) 是否有责(9)
-     *     处理进度(10) 责任队长(11) 队室内勤(12)
+     * R2: 时间(0) 航班号(1) 旅客姓名(2) 责任人(3) 投诉情况(4)
+     *     旅客诉求(5) 类别(6) 渠道来源(7) 是否有责(8) 处理进度(9)
      */
     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));              // 班组
-            String responsibleName = str(c, 4);    // 责任人
+            String responsibleName = str(c, 3);    // 责任人
             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));     // 队室内勤
-            
+            o.setComplaintDesc(str(c, 4));         // 投诉情况
+            o.setPassengerDemand(str(c, 5));       // 旅客诉求
+            o.setComplaintType(str(c, 6));         // 类别
+            o.setChannelSource(str(c, 7));         // 渠道来源
+            o.setIsResponsible(str(c, 8));         // 是否有责
+            o.setResultHandling(str(c, 9));        // 处理进度
+
             // 根据责任人名称查找组织信息和ID
             if (responsibleName != null && !responsibleName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(responsibleName);

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

@@ -6,8 +6,13 @@
         <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="responsibleName" column="responsible_name" />
+        <result property="responsibleId" column="responsible_id" />
         <result property="flightNo" column="flight_no" />
         <result property="passengerName" column="passenger_name" />
         <result property="complaintType" column="complaint_type" />
@@ -15,12 +20,9 @@
         <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" />
@@ -28,19 +30,13 @@
         <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, 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,
+               is_responsible, result_handling, deduct_score, evidence_file,
                import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_complaint
         WHERE del_flag = '0'
@@ -52,10 +48,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>
@@ -65,4 +61,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>