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

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

@@ -88,7 +88,7 @@ public class LedgerTemplateController extends BaseController {
         nm.put("channelPassRate", "通道过检率");
         hm.put("channelPassRate", 2);
         cm.put("channelPassRate", new String[]{
-            "组长","班组","内勤",
+            "小组",
             "2026年1月平均过检率","2026年2月平均过检率","2026年3月平均过检率",
             "2026年4月平均过检率","2026年5月平均过检率","2026年6月平均过检率",
             "2026年7月平均过检率","2026年8月平均过检率","2026年9月平均过检率",

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

@@ -27,14 +27,16 @@ public class LedgerChannelPassRate extends BaseEntity {
     @Excel(name = "部门名称")
     private String deptName;
 
-    @Excel(name = "队室/班组")
+    private Long deptId;
+
     private String teamName;
 
-    @Excel(name = "组长")
-    private String groupLeader;
+    private Long teamId;
+
+    private Long groupId;
 
-    @Excel(name = "队室内勤")
-    private String teamInternalDuty;
+    @Excel(name = "小组")
+    private String groupName;
 
     @Excel(name = "通道号")
     private String channelNo;
@@ -48,9 +50,6 @@ public class LedgerChannelPassRate extends BaseEntity {
     @Excel(name = "过检率(%)")
     private BigDecimal passRate;
 
-    @Excel(name = "备注")
-    private String remark;
-
     private String importBatch;
 
     @Excel(name = "数据来源")
@@ -59,27 +58,29 @@ 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 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 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 getGroupLeader() { return groupLeader; }
-    public void setGroupLeader(String groupLeader) { this.groupLeader = groupLeader; }
+    public Long getTeamId() { return teamId; }
+    public void setTeamId(Long teamId) { this.teamId = teamId; }
 
-    public String getTeamInternalDuty() { return teamInternalDuty; }
-    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+    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 getChannelNo() { return channelNo; }
     public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
@@ -93,9 +94,6 @@ public class LedgerChannelPassRate extends BaseEntity {
     public BigDecimal getPassRate() { return passRate; }
     public void setPassRate(BigDecimal passRate) { this.passRate = passRate; }
 
-    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; }
 
@@ -105,21 +103,4 @@ 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 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

@@ -555,18 +555,17 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
     /** 7. 通道过检率（pivot表）→ ledger_channel_pass_rate
      * R1: 大标题行
-     * R2: 组长(0) 班组(1) 队室内勤(2) 2026年1月平均过检率(3) 2026年2月...(4) ...
+     * R2: 小组(0) 2026年1月平均过检率(1) 2026年2月...(2) ...
      * 每行展开为多条（每月一条）
      */
     private int doChannelPassRate(Sheet sheet, String batchNo, String username) {
-        // 读第2行表头（POI 0-indexed = row index 1）
         Row headerRow = sheet.getRow(1);
         if (headerRow == null) return 0;
 
-        // 找月份列（从列3开始）
-        List<int[]> monthCols = new ArrayList<>(); // [colIndex, parsedDateMs]
+        // 找月份列（从列1开始）
+        List<int[]> monthCols = new ArrayList<>();
         Pattern p = Pattern.compile("(\\d{4})年(\\d{1,2})月");
-        for (int ci = 3; ci <= headerRow.getLastCellNum(); ci++) {
+        for (int ci = 1; ci <= headerRow.getLastCellNum(); ci++) {
             Cell cell = headerRow.getCell(ci);
             if (cell == null) continue;
             String label = formatter.formatCellValue(cell).trim();
@@ -583,44 +582,33 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
         List<LedgerChannelPassRate> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
-            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);
-            }
-            
+            String groupName = str(c, 0);
+
+            // 通过小组名称查找组织信息（TEAMS → MANAGER → BRIGADE）
+            Map<String, Object> orgInfo = resolveOrgInfoByGroupName(groupName);
+
             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.setGroupName(groupName);
                 o.setPassRate(rate);
-                // 用时间戳还原日期
                 Calendar cal = Calendar.getInstance();
                 cal.setTimeInMillis((long) mc[1] * 1000);
                 o.setRecordDate(cal.getTime());
                 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);
             }
         }
@@ -628,6 +616,38 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         return list.size();
     }
 
+    /**
+     * 通过小组名称（TEAMS）查找组织信息，向上补齐班组和部门
+     */
+    private Map<String, Object> resolveOrgInfoByGroupName(String groupName) {
+        Map<String, Object> result = new HashMap<>();
+        if (groupName == null || groupName.trim().isEmpty() || importCache == null) {
+            return result;
+        }
+        SysDept groupDept = importCache.getDeptByNameAndType(groupName.trim(), DeptType.TEAMS.getCode());
+        if (groupDept == null) {
+            return result;
+        }
+        result.put("groupId", groupDept.getDeptId());
+        result.put("groupName", groupDept.getDeptName());
+
+        if (groupDept.getParentId() != null && groupDept.getParentId() != 0) {
+            SysDept teamDept = importCache.getDeptById(groupDept.getParentId());
+            if (teamDept != null) {
+                result.put("teamId", teamDept.getDeptId());
+                result.put("teamName", teamDept.getDeptName());
+                if (teamDept.getParentId() != null && teamDept.getParentId() != 0) {
+                    SysDept brigadeDept = importCache.getDeptById(teamDept.getParentId());
+                    if (brigadeDept != null) {
+                        result.put("deptId", brigadeDept.getDeptId());
+                        result.put("deptName", brigadeDept.getDeptName());
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
     /** 8. 不安全事件 → ledger_unsafe_event
      * R2: 时间(0) 事件描述(1) 类别(2) 航班号(3) 责任人(4)
      *     涉及物品(5) 岗位(6) 区域(7) 通道号(8) 附件(9)
@@ -1339,6 +1359,15 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         public Long getAreaIdByName(String areaName) {
             return areaCache.get(areaName);
         }
+
+        public SysDept getDeptByNameAndType(String deptName, String deptType) {
+            for (SysDept dept : deptCache.values()) {
+                if (deptName.equals(dept.getDeptName()) && deptType.equals(dept.getDeptType())) {
+                    return dept;
+                }
+            }
+            return null;
+        }
     }
 
     // ════════════════════════════════════════════════════════════════

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

@@ -11,13 +11,10 @@
         <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" />
@@ -25,14 +22,12 @@
         <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, 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
+               channel_no, total_count, pass_count, pass_rate,
+               import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_channel_pass_rate
         WHERE del_flag = '0'
     </sql>
@@ -43,10 +38,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>
@@ -56,4 +51,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>