Merge remote-tracking branch 'origin/master'

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

@@ -47,13 +47,13 @@ public class LedgerTemplateController extends BaseController {
         });
 
         // 2. 队室三级质控巡查记录表 (21列)
-        nm.put("patrolInspection", "队室三级质控巡查记录表");
-        hm.put("patrolInspection", 2);
-        cm.put("patrolInspection", new String[]{
-            "巡查日期","巡查区域","巡查工作点","巡查时间段","巡查岗位","被检查人员","有无问题","检查情况描述",
-            "类型","整改措施","附件","整改情况","佐证材料","班组","责任组长",
-            "队室质控员","队室负责人","填报人","队室内勤","填报时间","发送至相关人员"
-        });
+//        nm.put("patrolInspection", "队室三级质控巡查记录表");
+//        hm.put("patrolInspection", 2);
+//        cm.put("patrolInspection", new String[]{
+//            "巡查日期","巡查区域","巡查工作点","巡查时间段","巡查岗位","被检查人员","有无问题","检查情况描述",
+//            "类型","整改措施","附件","整改情况","佐证材料","班组","责任组长",
+//            "队室质控员","队室负责人","填报人","队室内勤","填报时间","发送至相关人员"
+//        });
 
         // 3. 部门实时质控拦截情况记录表 (29列)
         nm.put("realtimeInterception", "部门实时质控拦截情况记录表");
@@ -141,11 +141,11 @@ public class LedgerTemplateController extends BaseController {
         });
 
         // 13. 部门奖惩记录表 (5列)
-        nm.put("rewardPenalty", "部门奖惩记录表");
-        hm.put("rewardPenalty", 2);
-        cm.put("rewardPenalty", new String[]{
-            "姓名","班组","事由","罚款金额","最后更新时间"
-        });
+//        nm.put("rewardPenalty", "部门奖惩记录表");
+//        hm.put("rewardPenalty", 2);
+//        cm.put("rewardPenalty", new String[]{
+//            "姓名","班组","事由","罚款金额","最后更新时间"
+//        });
 
         // 14. 请、休假记录表（特殊）(6列)
         nm.put("leaveSpecial", "请、休假记录表（特殊）");
@@ -155,51 +155,51 @@ public class LedgerTemplateController extends BaseController {
         });
 
         // 15. 锦旗及感谢信 (7列)
-        nm.put("bannerLetter", "锦旗及感谢信");
-        hm.put("bannerLetter", 2);
-        cm.put("bannerLetter", new String[]{
-            "时间","姓名","内容","类别","图片附件","班组","队室内勤"
-        });
+//        nm.put("bannerLetter", "锦旗及感谢信");
+//        hm.put("bannerLetter", 2);
+//        cm.put("bannerLetter", new String[]{
+//            "时间","姓名","内容","类别","图片附件","班组","队室内勤"
+//        });
 
         // 16. 日常培训记录 (12列)
-        nm.put("dailyTraining", "日常培训记录");
-        hm.put("dailyTraining", 2);
-        cm.put("dailyTraining", new String[]{
-            "月度培训记录日期","班组","队室负责教员","队室培训负责队长","课时","项目名称",
-            "培训内容","培训教员","培训地点","参训人数","是否完成","备注"
-        });
+//        nm.put("dailyTraining", "日常培训记录");
+//        hm.put("dailyTraining", 2);
+//        cm.put("dailyTraining", new String[]{
+//            "月度培训记录日期","班组","队室负责教员","队室培训负责队长","课时","项目名称",
+//            "培训内容","培训教员","培训地点","参训人数","是否完成","备注"
+//        });
 
         // 17. 组长履职情况记录表 (6列)
-        nm.put("leaderDuty", "组长履职情况记录表");
-        hm.put("leaderDuty", 2);
-        cm.put("leaderDuty", new String[]{
-            "本班点评","问题处置及整改措施","工作提示","提交人","队室负责人","队室质控员"
-        });
+//        nm.put("leaderDuty", "组长履职情况记录表");
+//        hm.put("leaderDuty", 2);
+//        cm.put("leaderDuty", new String[]{
+//            "本班点评","问题处置及整改措施","工作提示","提交人","队室负责人","队室质控员"
+//        });
 
         // 18. 健康锐兵（2026_3）(21列)
-        nm.put("healthSoldier", "健康锐兵（2026_3）");
-        hm.put("healthSoldier", 2);
-        cm.put("healthSoldier", new String[]{
-            "慢性病情况","提交人","近期身体不适情况","是否进行过体检","体检报告是否有异常",
-            "近期是否有重大疾病","作息及生活习惯","心理状态","工作压力情况","佐证材料",
-            "重大疾病（其他）","体检异常（其他）","近期不适（其他）","慢性病（轻度）","慢性病（重度）",
-            "既往病史","既往病史（其他）","提交时间","班组","队室负责人","亚健康人员状态"
-        });
+//        nm.put("healthSoldier", "健康锐兵（2026_3）");
+//        hm.put("healthSoldier", 2);
+//        cm.put("healthSoldier", new String[]{
+//            "慢性病情况","提交人","近期身体不适情况","是否进行过体检","体检报告是否有异常",
+//            "近期是否有重大疾病","作息及生活习惯","心理状态","工作压力情况","佐证材料",
+//            "重大疾病（其他）","体检异常（其他）","近期不适（其他）","慢性病（轻度）","慢性病（重度）",
+//            "既往病史","既往病史（其他）","提交时间","班组","队室负责人","亚健康人员状态"
+//        });
 
         // 19. 宿舍消防安全专项自查表（部门）(11列)
-        nm.put("dormFireSafety", "宿舍消防安全专项自查表（部门）");
-        hm.put("dormFireSafety", 2);
-        cm.put("dormFireSafety", new String[]{
-            "检查日期","寝室所在位置","寝室号","自查覆盖项","风险类型排查情况","发现具体隐患",
-            "照片","整改责任人","整改完成时间","提交时间","提交人"
-        });
+//        nm.put("dormFireSafety", "宿舍消防安全专项自查表（部门）");
+//        hm.put("dormFireSafety", 2);
+//        cm.put("dormFireSafety", new String[]{
+//            "检查日期","寝室所在位置","寝室号","自查覆盖项","风险类型排查情况","发现具体隐患",
+//            "照片","整改责任人","整改完成时间","提交时间","提交人"
+//        });
 
         // 20. 培训台账问题通报 (7列)
-        nm.put("trainingIssue", "培训台账问题通报");
-        hm.put("trainingIssue", 2);
-        cm.put("trainingIssue", new String[]{
-            "问题台账日期","问题台账内容","具体问题","处理人","班组","二次复核问题","是否完成整改"
-        });
+//        nm.put("trainingIssue", "培训台账问题通报");
+//        hm.put("trainingIssue", 2);
+//        cm.put("trainingIssue", new String[]{
+//            "问题台账日期","问题台账内容","具体问题","处理人","班组","二次复核问题","是否完成整改"
+//        });
 
         KEY_TO_SHEET = Collections.unmodifiableMap(nm);
         KEY_TO_HEADS = Collections.unmodifiableMap(hm);

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/EmployeePortraitVO.java

@@ -51,6 +51,7 @@ public class EmployeePortraitVO {
     private Integer xrayOperatorYears;   // 开机年限（新增字段）
     private Integer companyYears;        // 司龄（新增字段）
     private String securityInspectionPosition;
+    private String userTags;              //用户标签
 
     // ── 综合得分 ──────────────────────────────────────────────────────────────
 
@@ -87,6 +88,9 @@ public class EmployeePortraitVO {
 
     // ── getter / setter ───────────────────────────────────────────────────────
 
+    public String getUserTags() { return userTags; }
+    public void setUserTags(String userTags) { this.userTags = userTags; }
+
     public Long getUserId() { return userId; }
     public void setUserId(Long userId) { this.userId = userId; }
 

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

@@ -204,6 +204,7 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         vo.setEntryDate(user.getEntryDate());
         vo.setXrayOperatorStarttime(user.getXrayOperatorStarttime());
         vo.setSecurityInspectionPosition(user.getSecurityInspectionPosition());
+        vo.setUserTags(user.getTags());
 
         // 司龄、工龄、开机年限
         long nowMs = System.currentTimeMillis();

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

@@ -134,7 +134,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     private int dispatch(Sheet sheet, String handler, String batchNo, String username) {
         switch (handler) {
             case "supervisionProblem":    return doSupervisionProblem(sheet, batchNo, username);
-            case "patrolInspection":      return doPatrolInspection(sheet, batchNo, username);
+//            case "patrolInspection":      return doPatrolInspection(sheet, batchNo, username);
             case "realtimeInterception":  return doRealtimeInterception(sheet, batchNo, username);
             case "servicePatrol":         return doServicePatrol(sheet, batchNo, username);
             case "complaint":             return doComplaint(sheet, batchNo, username);
@@ -145,14 +145,14 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             case "terminalBonus":         return doTerminalBonus(sheet, batchNo, username);
             case "examScore":             return doExamScore(sheet, batchNo, username);
             case "rewardApproval":        return doRewardApproval(sheet, batchNo, username);
-            case "rewardPenalty":         return doRewardPenalty(sheet, batchNo, username);
+//            case "rewardPenalty":       return doRewardPenalty(sheet, batchNo, username);
             case "leaveSpecial":          return doLeaveSpecial(sheet, batchNo, username);
-            case "bannerLetter":          return doBannerLetter(sheet, batchNo, username);
-            case "dailyTraining":         return doDailyTraining(sheet, batchNo, username);
-            case "leaderDuty":            return doLeaderDuty(sheet, batchNo, username);
-            case "healthSoldier":         return doHealthSoldier(sheet, batchNo, username);
-            case "dormFireSafety":        return doDormFireSafety(sheet, batchNo, username);
-            case "trainingIssue":         return doTrainingIssue(sheet, batchNo, username);
+//            case "bannerLetter":          return doBannerLetter(sheet, batchNo, username);
+//            case "dailyTraining":         return doDailyTraining(sheet, batchNo, username);
+//            case "leaderDuty":            return doLeaderDuty(sheet, batchNo, username);
+//            case "healthSoldier":         return doHealthSoldier(sheet, batchNo, username);
+//            case "dormFireSafety":        return doDormFireSafety(sheet, batchNo, username);
+//            case "trainingIssue":         return doTrainingIssue(sheet, batchNo, username);
             default: return 0;
         }
     }
@@ -252,78 +252,78 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
      *          队室质控员(15) 队室负责人(16) 填报人(17) 队室内勤(18) 填报时间(19)
      *          发送至相关人员(20)
      */
-    private int doPatrolInspection(Sheet sheet, String batchNo, String username) {
-        List<LedgerPatrolInspection> list = new ArrayList<>();
-        for (Object[] c : dataRows(sheet, 2)) {
-            LedgerPatrolInspection o = new LedgerPatrolInspection();
-            
-            // 按照新的导入顺序映射字段
-            o.setRecordDate(date(c, 0));           // 巡查日期
-            o.setLocation(str(c, 1));              // 巡查区域
-            o.setChannelNo(str(c, 2));             // 巡查工作点
-            o.setPatrolTimePeriod(str(c, 3));      // 巡查时间段
-            String positionName = str(c, 4);       // 巡查岗位
-            o.setPatrolItem(positionName);
-            String inspectedName = str(c, 5);      // 被检查人员
-            o.setInspectedName(inspectedName);
-            o.setHasProblem(str(c, 6));            // 有无问题
-            o.setProblemDesc(str(c, 7));           // 检查情况描述
-            o.setPatrolType(str(c, 8));            // 类型
-            o.setResultHandling(str(c, 9));        // 整改措施
-            o.setEvidenceFile(str(c, 10));         // 附件
-            o.setRectificationStatus(str(c, 11));  // 整改情况
-            o.setEvidenceMaterial(str(c, 12));     // 佐证材料
-            o.setTeamName(str(c, 13));             // 班组
-            o.setResponsibleLeader(str(c, 14));    // 责任组长
-            o.setQualityOfficer(str(c, 15));       // 队室质控员
-            o.setTeamLeader(str(c, 16));           // 队室负责人
-            o.setReporter(str(c, 17));             // 填报人
-            o.setTeamInternalDuty(str(c, 18));     // 队室内勤
-            o.setReportTime(date(c, 19));          // 填报时间
-            o.setSendToRelevant(str(c, 20));       // 发送至相关人员
-            
-            // 根据被查人名称查找组织ID和名称
-            if (inspectedName != null && !inspectedName.trim().isEmpty()) {
-                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
-                if (!orgInfo.isEmpty()) {
-                    o.setInspectedId((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"));
-                }
-            }
-            
-            // 根据岗位和区域查找对应ID
-            if (importCache != null) {
-                // 岗位ID
-                if (positionName != null && !positionName.trim().isEmpty()) {
-                    Long positionId = importCache.getPositionIdByName(positionName.trim());
-                    if (positionId != null) {
-                        o.setPositionId(positionId);
-                    }
-                }
-                
-                // 区域ID
-                String areaName = o.getLocation();
-                if (areaName != null && !areaName.trim().isEmpty()) {
-                    Long areaId = importCache.getAreaIdByName(areaName.trim());
-                    if (areaId != null) {
-                        o.setAreaId(areaId);
-                    }
-                }
-            }
-            
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
-        }
-        patrolInspectionService.batchInsert(list);
-        return list.size();
-    }
+//    private int doPatrolInspection(Sheet sheet, String batchNo, String username) {
+//        List<LedgerPatrolInspection> list = new ArrayList<>();
+//        for (Object[] c : dataRows(sheet, 2)) {
+//            LedgerPatrolInspection o = new LedgerPatrolInspection();
+//
+//            // 按照新的导入顺序映射字段
+//            o.setRecordDate(date(c, 0));           // 巡查日期
+//            o.setLocation(str(c, 1));              // 巡查区域
+//            o.setChannelNo(str(c, 2));             // 巡查工作点
+//            o.setPatrolTimePeriod(str(c, 3));      // 巡查时间段
+//            String positionName = str(c, 4);       // 巡查岗位
+//            o.setPatrolItem(positionName);
+//            String inspectedName = str(c, 5);      // 被检查人员
+//            o.setInspectedName(inspectedName);
+//            o.setHasProblem(str(c, 6));            // 有无问题
+//            o.setProblemDesc(str(c, 7));           // 检查情况描述
+//            o.setPatrolType(str(c, 8));            // 类型
+//            o.setResultHandling(str(c, 9));        // 整改措施
+//            o.setEvidenceFile(str(c, 10));         // 附件
+//            o.setRectificationStatus(str(c, 11));  // 整改情况
+//            o.setEvidenceMaterial(str(c, 12));     // 佐证材料
+//            o.setTeamName(str(c, 13));             // 班组
+//            o.setResponsibleLeader(str(c, 14));    // 责任组长
+//            o.setQualityOfficer(str(c, 15));       // 队室质控员
+//            o.setTeamLeader(str(c, 16));           // 队室负责人
+//            o.setReporter(str(c, 17));             // 填报人
+//            o.setTeamInternalDuty(str(c, 18));     // 队室内勤
+//            o.setReportTime(date(c, 19));          // 填报时间
+//            o.setSendToRelevant(str(c, 20));       // 发送至相关人员
+//
+//            // 根据被查人名称查找组织ID和名称
+//            if (inspectedName != null && !inspectedName.trim().isEmpty()) {
+//                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
+//                if (!orgInfo.isEmpty()) {
+//                    o.setInspectedId((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"));
+//                }
+//            }
+//
+//            // 根据岗位和区域查找对应ID
+//            if (importCache != null) {
+//                // 岗位ID
+//                if (positionName != null && !positionName.trim().isEmpty()) {
+//                    Long positionId = importCache.getPositionIdByName(positionName.trim());
+//                    if (positionId != null) {
+//                        o.setPositionId(positionId);
+//                    }
+//                }
+//
+//                // 区域ID
+//                String areaName = o.getLocation();
+//                if (areaName != null && !areaName.trim().isEmpty()) {
+//                    Long areaId = importCache.getAreaIdByName(areaName.trim());
+//                    if (areaId != null) {
+//                        o.setAreaId(areaId);
+//                    }
+//                }
+//            }
+//
+//            o.setImportBatch(batchNo);
+//            o.setSourceType("1");
+//            o.setCreateBy(username);
+//            list.add(o);
+//        }
+//        patrolInspectionService.batchInsert(list);
+//        return list.size();
+//    }
 
     /** 3. 部门实时质控拦截情况记录表 → ledger_realtime_interception
      * 导入顺序：时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 实时质控拦截物品(5) 个数(6)
@@ -964,25 +964,25 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     /** 13. 部门奖惩记录表 → ledger_reward_penalty
      * R2: 姓名(0) 班组(1) 事由(2) 扣罚金额(3) 最后更新时间(4)
      */
-    private int doRewardPenalty(Sheet sheet, String batchNo, String username) {
-        List<LedgerRewardPenalty> list = new ArrayList<>();
-        for (Object[] c : dataRows(sheet, 2)) {
-            LedgerRewardPenalty o = new LedgerRewardPenalty();
-            o.setPersonName(str(c, 0));
-            o.setTeamName(str(c, 1));
-            o.setEventDesc(str(c, 2));
-            BigDecimal amt = decimal(c, 3);
-            o.setScoreChange(amt != null ? amt.negate() : null);
-            o.setType("2");  // 扣罚
-            o.setRecordDate(date(c, 4));
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
-        }
-        rewardPenaltyService.batchInsert(list);
-        return list.size();
-    }
+//    private int doRewardPenalty(Sheet sheet, String batchNo, String username) {
+//        List<LedgerRewardPenalty> list = new ArrayList<>();
+//        for (Object[] c : dataRows(sheet, 2)) {
+//            LedgerRewardPenalty o = new LedgerRewardPenalty();
+//            o.setPersonName(str(c, 0));
+//            o.setTeamName(str(c, 1));
+//            o.setEventDesc(str(c, 2));
+//            BigDecimal amt = decimal(c, 3);
+//            o.setScoreChange(amt != null ? amt.negate() : null);
+//            o.setType("2");  // 扣罚
+//            o.setRecordDate(date(c, 4));
+//            o.setImportBatch(batchNo);
+//            o.setSourceType("1");
+//            o.setCreateBy(username);
+//            list.add(o);
+//        }
+//        rewardPenaltyService.batchInsert(list);
+//        return list.size();
+//    }
 
     /** 14. 请、休假记录表（特殊）→ ledger_leave_special
      * R2: 姓名(0) 班组(1) 时间（起）(2) 时间（止）(3) 休假类别(4) 天数/时长(5)
@@ -1011,93 +1011,93 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
      * R2: 时间(0) 姓名(1) 获得感谢信的具体内容(2) 类别(3) 图片和附件(4) 班组(5) 队室内勤(6)
      * 类别: 锦旗→'1', 其他→'2'
      */
-    private int doBannerLetter(Sheet sheet, String batchNo, String username) {
-        List<LedgerBannerLetter> list = new ArrayList<>();
-        for (Object[] c : dataRows(sheet, 2)) {
-            LedgerBannerLetter o = new LedgerBannerLetter();
-            o.setRecordDate(date(c, 0));                        // 时间
-            String personName = str(c, 1);
-            o.setPersonName(personName);                         // 姓名
-            o.setContentDesc(str(c, 2));                        // 获得感谢信的具体内容
-            String typeStr = str(c, 3);
-            o.setType("锦旗".equals(typeStr) ? "1" : "2");      // 类别
-            o.setEvidenceFile(str(c, 4));                        // 图片和附件
-            o.setTeamName(str(c, 5));                           // 班组
-            o.setTeamInternalDuty(str(c, 6));                    // 队室内勤
-            
-            // 根据姓名查找组织ID
-            if (personName != null && !personName.trim().isEmpty()) {
-                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
-                if (!orgInfo.isEmpty()) {
-                    o.setPersonUserId((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);
-            list.add(o);
-        }
-        bannerLetterService.batchInsert(list);
-        return list.size();
-    }
+//    private int doBannerLetter(Sheet sheet, String batchNo, String username) {
+//        List<LedgerBannerLetter> list = new ArrayList<>();
+//        for (Object[] c : dataRows(sheet, 2)) {
+//            LedgerBannerLetter o = new LedgerBannerLetter();
+//            o.setRecordDate(date(c, 0));                        // 时间
+//            String personName = str(c, 1);
+//            o.setPersonName(personName);                         // 姓名
+//            o.setContentDesc(str(c, 2));                        // 获得感谢信的具体内容
+//            String typeStr = str(c, 3);
+//            o.setType("锦旗".equals(typeStr) ? "1" : "2");      // 类别
+//            o.setEvidenceFile(str(c, 4));                        // 图片和附件
+//            o.setTeamName(str(c, 5));                           // 班组
+//            o.setTeamInternalDuty(str(c, 6));                    // 队室内勤
+//
+//            // 根据姓名查找组织ID
+//            if (personName != null && !personName.trim().isEmpty()) {
+//                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
+//                if (!orgInfo.isEmpty()) {
+//                    o.setPersonUserId((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);
+//            list.add(o);
+//        }
+//        bannerLetterService.batchInsert(list);
+//        return list.size();
+//    }
 
     /** 16. 日常培训记录 → ledger_daily_training
      * R2: 月度培训记录(0) 班组(1) 队室负责教员(2) 队室培训负责队长(3) 课时(4)
      *     项目名称(5) 培训内容(6) 培训教员(7) 培训地点(8) 参训人数(9) 是否完成(10) 备注(11)
      */
-    private int doDailyTraining(Sheet sheet, String batchNo, String username) {
-        List<LedgerDailyTraining> list = new ArrayList<>();
-        for (Object[] c : dataRows(sheet, 2)) {
-            LedgerDailyTraining o = new LedgerDailyTraining();
-            o.setRecordDate(date(c, 0));
-            o.setTeamName(str(c, 1));
-            o.setResponsibleTeacher(str(c, 2));
-            o.setResponsibleLeader(str(c, 3));
-            o.setHours(str(c, 4));
-            o.setProjectName(str(c, 5));
-            o.setTrainingContent(str(c, 6));
-            o.setTrainer(str(c, 7));
-            o.setTrainingLocation(str(c, 8));
-            o.setParticipantCount(integer(c, 9));
-            o.setIsCompleted(str(c, 10));
-            o.setRemark(str(c, 11));
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
-        }
-        dailyTrainingService.batchInsert(list);
-        return list.size();
-    }
+//    private int doDailyTraining(Sheet sheet, String batchNo, String username) {
+//        List<LedgerDailyTraining> list = new ArrayList<>();
+//        for (Object[] c : dataRows(sheet, 2)) {
+//            LedgerDailyTraining o = new LedgerDailyTraining();
+//            o.setRecordDate(date(c, 0));
+//            o.setTeamName(str(c, 1));
+//            o.setResponsibleTeacher(str(c, 2));
+//            o.setResponsibleLeader(str(c, 3));
+//            o.setHours(str(c, 4));
+//            o.setProjectName(str(c, 5));
+//            o.setTrainingContent(str(c, 6));
+//            o.setTrainer(str(c, 7));
+//            o.setTrainingLocation(str(c, 8));
+//            o.setParticipantCount(integer(c, 9));
+//            o.setIsCompleted(str(c, 10));
+//            o.setRemark(str(c, 11));
+//            o.setImportBatch(batchNo);
+//            o.setSourceType("1");
+//            o.setCreateBy(username);
+//            list.add(o);
+//        }
+//        dailyTrainingService.batchInsert(list);
+//        return list.size();
+//    }
 
     /** 17. 组长履职情况记录表 → ledger_leader_duty
      * R2: 本班点评(0) 问题处置及整改措施(1) 工作提示(2) 提交人(3) 队室负责人(4) 队室质控员(5)
      */
-    private int doLeaderDuty(Sheet sheet, String batchNo, String username) {
-        List<LedgerLeaderDuty> list = new ArrayList<>();
-        for (Object[] c : dataRows(sheet, 2)) {
-            LedgerLeaderDuty o = new LedgerLeaderDuty();
-            o.setClassComment(str(c, 0));
-            o.setProblemHandling(str(c, 1));
-            o.setWorkTip(str(c, 2));
-            o.setSubmitter(str(c, 3));
-            o.setTeamLeader(str(c, 4));
-            o.setQualityOfficer(str(c, 5));
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
-        }
-        leaderDutyService.batchInsert(list);
-        return list.size();
-    }
+//    private int doLeaderDuty(Sheet sheet, String batchNo, String username) {
+//        List<LedgerLeaderDuty> list = new ArrayList<>();
+//        for (Object[] c : dataRows(sheet, 2)) {
+//            LedgerLeaderDuty o = new LedgerLeaderDuty();
+//            o.setClassComment(str(c, 0));
+//            o.setProblemHandling(str(c, 1));
+//            o.setWorkTip(str(c, 2));
+//            o.setSubmitter(str(c, 3));
+//            o.setTeamLeader(str(c, 4));
+//            o.setQualityOfficer(str(c, 5));
+//            o.setImportBatch(batchNo);
+//            o.setSourceType("1");
+//            o.setCreateBy(username);
+//            list.add(o);
+//        }
+//        leaderDutyService.batchInsert(list);
+//        return list.size();
+//    }
 
     /** 18. 健康锐兵 → ledger_health_soldier
      * R2(0~20): 慢性病(0) 提交人(1) 近期不适(2) 是否体检(3) 体检异常(4) 重大疾病(5)
@@ -1106,90 +1106,90 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
      *           ext_chronic_mild(13) ext_chronic_severe(14) 既往病史(15) ext_medical_history(16)
      *           提交时间(17) 班组(18) 队室负责人(19) 亚健康人员(20)
      */
-    private int doHealthSoldier(Sheet sheet, String batchNo, String username) {
-        List<LedgerHealthSoldier> list = new ArrayList<>();
-        for (Object[] c : dataRows(sheet, 2)) {
-            LedgerHealthSoldier o = new LedgerHealthSoldier();
-            o.setChronicDisease(str(c, 0));
-            o.setSubmitter(str(c, 1));
-            o.setRecentSymptoms(str(c, 2));
-            o.setHasPhysicalExam(str(c, 3));
-            o.setExamReportAbnormal(str(c, 4));
-            o.setMajorDiseaseRecent(str(c, 5));
-            o.setDailyHabits(str(c, 6));
-            o.setMentalState(str(c, 7));
-            o.setWorkPressure(str(c, 8));
-            o.setEvidenceFile(str(c, 9));
-            o.setExtMajorDisease(str(c, 10));
-            o.setExtExamAbnormal(str(c, 11));
-            o.setExtRecentSymptoms(str(c, 12));
-            o.setExtChronicMild(str(c, 13));
-            o.setExtChronicSevere(str(c, 14));
-            o.setMedicalHistory(str(c, 15));
-            o.setExtMedicalHistory(str(c, 16));
-            o.setSubmitTime(date(c, 17));
-            o.setTeamName(str(c, 18));
-            o.setTeamLeader(str(c, 19));
-            o.setSubHealthStatus(str(c, 20));
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
-        }
-        healthSoldierService.batchInsert(list);
-        return list.size();
-    }
+//    private int doHealthSoldier(Sheet sheet, String batchNo, String username) {
+//        List<LedgerHealthSoldier> list = new ArrayList<>();
+//        for (Object[] c : dataRows(sheet, 2)) {
+//            LedgerHealthSoldier o = new LedgerHealthSoldier();
+//            o.setChronicDisease(str(c, 0));
+//            o.setSubmitter(str(c, 1));
+//            o.setRecentSymptoms(str(c, 2));
+//            o.setHasPhysicalExam(str(c, 3));
+//            o.setExamReportAbnormal(str(c, 4));
+//            o.setMajorDiseaseRecent(str(c, 5));
+//            o.setDailyHabits(str(c, 6));
+//            o.setMentalState(str(c, 7));
+//            o.setWorkPressure(str(c, 8));
+//            o.setEvidenceFile(str(c, 9));
+//            o.setExtMajorDisease(str(c, 10));
+//            o.setExtExamAbnormal(str(c, 11));
+//            o.setExtRecentSymptoms(str(c, 12));
+//            o.setExtChronicMild(str(c, 13));
+//            o.setExtChronicSevere(str(c, 14));
+//            o.setMedicalHistory(str(c, 15));
+//            o.setExtMedicalHistory(str(c, 16));
+//            o.setSubmitTime(date(c, 17));
+//            o.setTeamName(str(c, 18));
+//            o.setTeamLeader(str(c, 19));
+//            o.setSubHealthStatus(str(c, 20));
+//            o.setImportBatch(batchNo);
+//            o.setSourceType("1");
+//            o.setCreateBy(username);
+//            list.add(o);
+//        }
+//        healthSoldierService.batchInsert(list);
+//        return list.size();
+//    }
 
     /** 19. 宿舍消防安全专项自查表 → ledger_dorm_fire_safety
      * R2: 检查日期(0) 寝室所在位置(1) 寝室号(2) 自查覆盖项(3) 风险类型排查情况(4)
      *     发现具体隐患(5) 照片(6) 整改责任人(7) 整改完成时间(8) 提交时间(9) 提交人(10)
      */
-    private int doDormFireSafety(Sheet sheet, String batchNo, String username) {
-        List<LedgerDormFireSafety> list = new ArrayList<>();
-        for (Object[] c : dataRows(sheet, 2)) {
-            LedgerDormFireSafety o = new LedgerDormFireSafety();
-            o.setCheckDate(date(c, 0));
-            o.setDormLocation(str(c, 1));
-            o.setDormNo(str(c, 2));
-            o.setCheckItems(str(c, 3));
-            o.setRiskStatus(str(c, 4));
-            o.setFoundRisk(str(c, 5));
-            o.setPhotos(str(c, 6));
-            o.setRectifyPerson(str(c, 7));
-            o.setRectifyTime(date(c, 8));
-            o.setSubmitTime(date(c, 9));
-            o.setSubmitter(str(c, 10));
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
-        }
-        dormFireSafetyService.batchInsert(list);
-        return list.size();
-    }
+//    private int doDormFireSafety(Sheet sheet, String batchNo, String username) {
+//        List<LedgerDormFireSafety> list = new ArrayList<>();
+//        for (Object[] c : dataRows(sheet, 2)) {
+//            LedgerDormFireSafety o = new LedgerDormFireSafety();
+//            o.setCheckDate(date(c, 0));
+//            o.setDormLocation(str(c, 1));
+//            o.setDormNo(str(c, 2));
+//            o.setCheckItems(str(c, 3));
+//            o.setRiskStatus(str(c, 4));
+//            o.setFoundRisk(str(c, 5));
+//            o.setPhotos(str(c, 6));
+//            o.setRectifyPerson(str(c, 7));
+//            o.setRectifyTime(date(c, 8));
+//            o.setSubmitTime(date(c, 9));
+//            o.setSubmitter(str(c, 10));
+//            o.setImportBatch(batchNo);
+//            o.setSourceType("1");
+//            o.setCreateBy(username);
+//            list.add(o);
+//        }
+//        dormFireSafetyService.batchInsert(list);
+//        return list.size();
+//    }
 
     /** 20. 培训台账问题通报 → ledger_training_issue
      * R2: 问题台账日期(0) 问题台账内容(1) 具体问题(2) 处理人(3) 班组(4) 二次复核问题(5) 是否完成整改(6)
      */
-    private int doTrainingIssue(Sheet sheet, String batchNo, String username) {
-        List<LedgerTrainingIssue> list = new ArrayList<>();
-        for (Object[] c : dataRows(sheet, 2)) {
-            LedgerTrainingIssue o = new LedgerTrainingIssue();
-            o.setRecordDate(date(c, 0));
-            o.setLedgerContent(str(c, 1));
-            o.setSpecificProblem(str(c, 2));
-            o.setHandler(str(c, 3));
-            o.setTeamName(str(c, 4));
-            o.setRecheckProblem(str(c, 5));
-            o.setIsRectified(str(c, 6));
-            o.setImportBatch(batchNo);
-            o.setSourceType("1");
-            o.setCreateBy(username);
-            list.add(o);
-        }
-        trainingIssueService.batchInsert(list);
-        return list.size();
-    }
+//    private int doTrainingIssue(Sheet sheet, String batchNo, String username) {
+//        List<LedgerTrainingIssue> list = new ArrayList<>();
+//        for (Object[] c : dataRows(sheet, 2)) {
+//            LedgerTrainingIssue o = new LedgerTrainingIssue();
+//            o.setRecordDate(date(c, 0));
+//            o.setLedgerContent(str(c, 1));
+//            o.setSpecificProblem(str(c, 2));
+//            o.setHandler(str(c, 3));
+//            o.setTeamName(str(c, 4));
+//            o.setRecheckProblem(str(c, 5));
+//            o.setIsRectified(str(c, 6));
+//            o.setImportBatch(batchNo);
+//            o.setSourceType("1");
+//            o.setCreateBy(username);
+//            list.add(o);
+//        }
+//        trainingIssueService.batchInsert(list);
+//        return list.size();
+//    }
 
     // ════════════════════════════════════════════════════════════════
     //  POI 工具方法