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

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

@@ -99,7 +99,7 @@ public class LedgerTemplateController extends BaseController {
         nm.put("unsafeEvent", "不安全事件");
         hm.put("unsafeEvent", 2);
         cm.put("unsafeEvent", new String[]{
-            "时间","事件描述","类别","航班号","责任人","涉及班组","涉及物品","岗位","区域","通道号","图像"
+            "时间","事件描述","类别","航班号","责任人","涉及物品","岗位","区域","通道号","附件"
         });
 
         // 9. 2026查获违规品统计 (23列)

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

@@ -21,7 +21,7 @@ public class LedgerUnsafeEvent 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 = "航班号")
@@ -30,27 +30,22 @@ public class LedgerUnsafeEvent extends BaseEntity {
     @Excel(name = "部门名称")
     private String deptName;
 
-    @Excel(name = "队室/班组")
+    private Long deptId;
+
     private String teamName;
 
-    @Excel(name = "队室内勤")
-    private String teamInternalDuty;
+    private Long teamId;
 
-    @Excel(name = "小组")
     private String groupName;
 
     private Long groupId;
 
-    private Long deptId;
-
-    private Long teamId;
-
     @Excel(name = "责任人")
     private String responsibleName;
 
     private Long responsibleId;
 
-    @Excel(name = "事件类型")
+    @Excel(name = "类别")
     private String eventType;
 
     @Excel(name = "涉及物品")
@@ -69,24 +64,18 @@ public class LedgerUnsafeEvent extends BaseEntity {
     @Excel(name = "通道号")
     private String channelNo;
 
-    @Excel(name = "图像")
+    @Excel(name = "附件")
     private String image;
 
     @Excel(name = "事件描述")
     private String eventDesc;
 
-    @Excel(name = "处理结果")
-    private String resultHandling;
-
     @Excel(name = "扣分")
     private BigDecimal deductScore;
 
     @Excel(name = "佐证附件")
     private String evidenceFile;
 
-    @Excel(name = "备注")
-    private String remark;
-
     private String importBatch;
 
     @Excel(name = "数据来源")
@@ -107,11 +96,14 @@ public class LedgerUnsafeEvent 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 String getTeamInternalDuty() { return teamInternalDuty; }
-    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+    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; }
@@ -119,12 +111,6 @@ public class LedgerUnsafeEvent extends BaseEntity {
     public Long getGroupId() { return groupId; }
     public void setGroupId(Long groupId) { this.groupId = groupId; }
 
-    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 String getResponsibleName() { return responsibleName; }
     public void setResponsibleName(String responsibleName) { this.responsibleName = responsibleName; }
 
@@ -158,18 +144,12 @@ public class LedgerUnsafeEvent extends BaseEntity {
     public String getEventDesc() { return eventDesc; }
     public void setEventDesc(String eventDesc) { this.eventDesc = eventDesc; }
 
-    public String getResultHandling() { return resultHandling; }
-    public void setResultHandling(String resultHandling) { this.resultHandling = resultHandling; }
-
     public BigDecimal getDeductScore() { return deductScore; }
     public void setDeductScore(BigDecimal deductScore) { this.deductScore = deductScore; }
 
     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; }
 

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

@@ -630,7 +630,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
     /** 8. 不安全事件 → ledger_unsafe_event
      * R2: 时间(0) 事件描述(1) 类别(2) 航班号(3) 责任人(4)
-     *     涉及班组(5) 涉及物品(6) 岗位(7) 区域(8) 通道号(9) 图像(10)
+     *     涉及物品(5) 岗位(6) 区域(7) 通道号(8) 附件(9)
      */
     private int doUnsafeEvent(Sheet sheet, String batchNo, String username) {
         List<LedgerUnsafeEvent> list = new ArrayList<>();
@@ -642,12 +642,11 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setFlightNo(str(c, 3));
             String responsibleName = str(c, 4);
             o.setResponsibleName(responsibleName);
-            o.setTeamName(str(c, 5));
-            o.setInvolvedItems(str(c, 6));
-            o.setPosition(str(c, 7));
-            o.setArea(str(c, 8));
-            o.setChannelNo(str(c, 9));
-            o.setImage(str(c, 10));
+            o.setInvolvedItems(str(c, 5));
+            o.setPosition(str(c, 6));
+            o.setArea(str(c, 7));
+            o.setChannelNo(str(c, 8));
+            o.setImage(str(c, 9));
             
             // 使用缓存查找组织信息和名称
             Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(responsibleName);

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

@@ -9,7 +9,6 @@
         <result property="deptName" column="dept_name" />
         <result property="deptId" column="dept_id" />
         <result property="teamName" column="team_name" />
-        <result property="teamInternalDuty" column="team_internal_duty" />
         <result property="teamId" column="team_id" />
         <result property="groupName" column="group_name" />
         <result property="groupId" column="group_id" />
@@ -24,10 +23,8 @@
         <result property="channelNo" column="channel_no" />
         <result property="image" column="image" />
         <result property="eventDesc" column="event_desc" />
-        <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"   />
@@ -38,7 +35,11 @@
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date, flight_no, dept_name, dept_id, team_name, team_internal_duty, team_id, group_name, group_id, responsible_name, responsible_id, event_type, involved_items, position, position_id, area, area_id, channel_no, image, event_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, flight_no, dept_name, dept_id, team_name, team_id, group_name, group_id,
+               responsible_name, responsible_id, event_type, involved_items,
+               position, position_id, area, area_id, channel_no, image, event_desc,
+               deduct_score, evidence_file,
+               import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_unsafe_event
         WHERE del_flag = '0'
     </sql>
@@ -50,10 +51,10 @@
         <if test="responsibleName != null and responsibleName != ''">AND responsible_name LIKE CONCAT('%', #{responsibleName}, '%')</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>