职业资格等级获取时间表开发

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

@@ -16,6 +16,7 @@ import com.sundot.airport.ledger.domain.LedgerLeaderDuty;
 import com.sundot.airport.ledger.domain.LedgerHealthSoldier;
 import com.sundot.airport.ledger.domain.LedgerDormFireSafety;
 import com.sundot.airport.ledger.domain.LedgerTrainingIssue;
+import com.sundot.airport.ledger.domain.LedgerQualificationLevel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -55,6 +56,7 @@ public class LedgerImportController extends BaseController {
     @Autowired private ILedgerRewardPenaltyService rewardPenaltyService;
     @Autowired private ILedgerLeaveSpecialService leaveSpecialService;
     @Autowired private ILedgerBannerLetterService bannerLetterService;
+    @Autowired private ILedgerQualificationLevelService qualificationLevelService;
 
 
     private String generateBatchNo() {
@@ -513,6 +515,29 @@ public class LedgerImportController extends BaseController {
         return AjaxResult.success("导入成功，共" + list.size() + "条");
     }
 
+    /**
+     * 职业资格等级获取时间表导入
+     * LedgerQualificationLevel
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:import:qualificationLevel')")
+    @Log(title = "台账导入-职业资格等级获取时间", businessType = BusinessType.IMPORT)
+    @PostMapping("/qualificationLevel")
+    public AjaxResult importQualificationLevel(@RequestParam("file") MultipartFile file) throws Exception {
+        String batchNo = generateBatchNo();
+        ExcelUtil<LedgerQualificationLevel> util = new ExcelUtil<>(LedgerQualificationLevel.class);
+        List<LedgerQualificationLevel> list = util.importExcel(file.getInputStream(), 1);
+        // 过滤null元素，避免空指针异常
+        if (list != null) {
+            list.removeIf(item -> item == null);
+        }
+        if (list == null || list.isEmpty()) {
+            return AjaxResult.error("导入数据为空或解析失败，请检查Excel表头是否与模板一致");
+        }
+        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+        qualificationLevelService.batchInsert(list);
+        return AjaxResult.success("导入成功，共" + list.size() + "条");
+    }
+
 
     /**
      * 一键全量导入 - 解析多Sheet合并Excel（旅检三部"三三"数字管理平台.xlsx）

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

@@ -0,0 +1,80 @@
+package com.sundot.airport.web.controller.ledger;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.ledger.domain.LedgerQualificationLevel;
+import com.sundot.airport.ledger.service.ILedgerQualificationLevelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 职业资格等级获取时间Controller
+ */
+@RestController
+@RequestMapping("/ledger/qualificationLevel")
+public class LedgerQualificationLevelController extends BaseController {
+
+    @Autowired
+    private ILedgerQualificationLevelService service;
+
+    @PreAuthorize("@ss.hasPermi('ledger:qualificationLevel:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LedgerQualificationLevel query) {
+        startPage();
+        List<LedgerQualificationLevel> list = service.selectList(query);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('ledger:qualificationLevel:export')")
+    @Log(title = "职业资格等级获取时间", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LedgerQualificationLevel query) {
+        List<LedgerQualificationLevel> list = service.selectList(query);
+        ExcelUtil<LedgerQualificationLevel> util = new ExcelUtil<>(LedgerQualificationLevel.class);
+        util.exportExcel(response, list, "职业资格等级获取时间");
+    }
+
+    @PreAuthorize("@ss.hasPermi('ledger:qualificationLevel:query')")
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable Long id) {
+        return AjaxResult.success(service.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('ledger:qualificationLevel:add')")
+    @Log(title = "职业资格等级获取时间", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody LedgerQualificationLevel entity) {
+        entity.setCreateBy(getUsername());
+        entity.setCreateTime(DateUtils.getNowDate());
+        return toAjax(service.save(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('ledger:qualificationLevel:edit')")
+    @Log(title = "职业资格等级获取时间", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody LedgerQualificationLevel entity) {
+        entity.setUpdateBy(getUsername());
+        entity.setUpdateTime(DateUtils.getNowDate());
+        return toAjax(service.updateById(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('ledger:qualificationLevel:remove')")
+    @Log(title = "职业资格等级获取时间", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        for (Long id : ids) {
+            service.removeById(id);
+        }
+        return AjaxResult.success();
+    }
+}

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

@@ -0,0 +1,126 @@
+package com.sundot.airport.ledger.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sundot.airport.common.annotation.Excel;
+import com.sundot.airport.common.core.domain.BaseEntity;
+
+/**
+ * 职业资格等级获取时间对象 ledger_qualification_level
+ */
+@TableName("ledger_qualification_level")
+public class LedgerQualificationLevel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Long userId;
+
+    private Long deptId;
+
+    private Long teamId;
+
+    private Long groupId;
+
+    @Excel(name = "姓名")
+    private String personName;
+
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    @Excel(name = "队室/班组")
+    private String teamName;
+
+    @Excel(name = "小组名称")
+    private String groupName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "一级发证时间", width = 20, dateFormat = "yyyy-MM-dd")
+    private Date levelOneTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "二级发证时间", width = 20, dateFormat = "yyyy-MM-dd")
+    private Date levelTwoTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "三级发证时间", width = 20, dateFormat = "yyyy-MM-dd")
+    private Date levelThreeTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "四级发证时间", width = 20, dateFormat = "yyyy-MM-dd")
+    private Date levelFourTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "五级发证时间", width = 20, dateFormat = "yyyy-MM-dd")
+    private Date levelFiveTime;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    private String importBatch;
+
+    @Excel(name = "数据来源")
+    private String sourceType;
+
+    @Excel(name = "同步标志(0=未同步;1=已同步)")
+    private String syncFlag;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+
+    public Long getUserId() { return userId; }
+    public void setUserId(Long userId) { this.userId = userId; }
+
+    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 getPersonName() { return personName; }
+    public void setPersonName(String personName) { this.personName = personName; }
+
+    public String getDeptName() { return deptName; }
+    public void setDeptName(String deptName) { this.deptName = deptName; }
+
+    public String getTeamName() { return teamName; }
+    public void setTeamName(String teamName) { this.teamName = teamName; }
+
+    public String getGroupName() { return groupName; }
+    public void setGroupName(String groupName) { this.groupName = groupName; }
+
+    public Date getLevelOneTime() { return levelOneTime; }
+    public void setLevelOneTime(Date levelOneTime) { this.levelOneTime = levelOneTime; }
+
+    public Date getLevelTwoTime() { return levelTwoTime; }
+    public void setLevelTwoTime(Date levelTwoTime) { this.levelTwoTime = levelTwoTime; }
+
+    public Date getLevelThreeTime() { return levelThreeTime; }
+    public void setLevelThreeTime(Date levelThreeTime) { this.levelThreeTime = levelThreeTime; }
+
+    public Date getLevelFourTime() { return levelFourTime; }
+    public void setLevelFourTime(Date levelFourTime) { this.levelFourTime = levelFourTime; }
+
+    public Date getLevelFiveTime() { return levelFiveTime; }
+    public void setLevelFiveTime(Date levelFiveTime) { this.levelFiveTime = levelFiveTime; }
+
+    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; }
+
+    public String getSourceType() { return sourceType; }
+    public void setSourceType(String sourceType) { this.sourceType = sourceType; }
+
+    public String getSyncFlag() { return syncFlag; }
+    public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/LedgerQualificationLevelMapper.java

@@ -0,0 +1,15 @@
+package com.sundot.airport.ledger.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sundot.airport.ledger.domain.LedgerQualificationLevel;
+
+/**
+ * 职业资格等级获取时间Mapper接口
+ */
+public interface LedgerQualificationLevelMapper extends BaseMapper<LedgerQualificationLevel> {
+    List<LedgerQualificationLevel> selectList(LedgerQualificationLevel query);
+
+    int updateSyncFlag();
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerQualificationLevelService.java

@@ -0,0 +1,11 @@
+package com.sundot.airport.ledger.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sundot.airport.ledger.domain.LedgerQualificationLevel;
+
+public interface ILedgerQualificationLevelService extends IService<LedgerQualificationLevel> {
+    List<LedgerQualificationLevel> selectList(LedgerQualificationLevel query);
+
+    int batchInsert(List<LedgerQualificationLevel> list);
+}

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

@@ -60,6 +60,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     @Autowired private ILedgerRewardPenaltyService rewardPenaltyService;
     @Autowired private ILedgerLeaveSpecialService leaveSpecialService;
     @Autowired private ILedgerBannerLetterService bannerLetterService;
+    @Autowired private ILedgerQualificationLevelService qualificationLevelService;
     @Autowired private ILedgerDailyTrainingService dailyTrainingService;
     @Autowired private ILedgerLeaderDutyService leaderDutyService;
     @Autowired private ILedgerHealthSoldierService healthSoldierService;
@@ -93,6 +94,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 //        SHEET_ROUTE.put("部门奖惩记录表",            "rewardPenalty");
         SHEET_ROUTE.put("请、休假记录表（特殊）",     "leaveSpecial");
 //        SHEET_ROUTE.put("锦旗及感谢信",              "bannerLetter");
+        SHEET_ROUTE.put("职业资格等级获取时间",      "qualificationLevel");
 //        SHEET_ROUTE.put("日常培训记录",              "dailyTraining");
 //        SHEET_ROUTE.put("组长履职情况记录表",         "leaderDuty");
 //        SHEET_ROUTE.put("健康锐兵（2026_3）",        "healthSoldier");
@@ -161,6 +163,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 //            case "rewardPenalty":       return doRewardPenalty(sheet, batchNo, username);
             case "leaveSpecial":          return doLeaveSpecial(sheet, batchNo, username);
 //            case "bannerLetter":          return doBannerLetter(sheet, batchNo, username);
+            case "qualificationLevel":    return doQualificationLevel(sheet, batchNo, username);
 //            case "dailyTraining":         return doDailyTraining(sheet, batchNo, username);
 //            case "leaderDuty":            return doLeaderDuty(sheet, batchNo, username);
 //            case "healthSoldier":         return doHealthSoldier(sheet, batchNo, username);
@@ -1322,7 +1325,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         if (v instanceof Double) return DateUtil.getJavaDate((Double) v);
         // try parse string
         String s = v.toString().trim();
-        for (String fmt : new String[]{"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd", "yyyy/MM/dd", "HH:mm:ss", "HH:mm"}) {
+        for (String fmt : new String[]{"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd", "yyyy/MM/dd","yyyy.MM.dd", "HH:mm:ss", "HH:mm"}) {
             try {
                 return new SimpleDateFormat(fmt).parse(s.substring(0, Math.min(s.length(), fmt.length())));
             } catch (Exception ignore) {}
@@ -1401,6 +1404,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         result.put("部门奖惩记录",        clearOne(rewardPenaltyService,         beginTime, endTime));
         result.put("请休假记录（特殊）",  clearOne(leaveSpecialService,          beginTime, endTime));
         result.put("锦旗及感谢信",        clearOne(bannerLetterService,          beginTime, endTime));
+        result.put("职业资格等级获取时间",  clearOne(qualificationLevelService,    beginTime, endTime));
         result.put("日常培训记录",        clearOne(dailyTrainingService,         beginTime, endTime));
         result.put("组长履职情况记录",    clearOne(leaderDutyService,            beginTime, endTime));
         result.put("健康锐兵",            clearOne(healthSoldierService,         beginTime, endTime));
@@ -1732,4 +1736,44 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     private <T> T copyObject(T source, Class<T> targetClass) {
         return BeanUtil.toBean(source, targetClass);
     }
+
+    /** 职业资格等级获取时间 → ledger_qualification_level
+     * 导入顺序：姓名(0) 一级发证时间(1) 二级发证时间(2) 三级发证时间(3)
+     *          四级发证时间(4) 五级发证时间(5)
+     */
+    private int doQualificationLevel(Sheet sheet, String batchNo, String username) {
+        List<LedgerQualificationLevel> list = new ArrayList<>();
+        for (Object[] c : dataRows(sheet, 2)) {
+            LedgerQualificationLevel o = new LedgerQualificationLevel();
+
+            String personName = str(c, 0);      // 姓名
+            o.setPersonName(personName);
+            o.setLevelOneTime(date(c, 1));      // 一级发证时间
+            o.setLevelTwoTime(date(c, 2));      // 二级发证时间
+            o.setLevelThreeTime(date(c, 3));    // 三级发证时间
+            o.setLevelFourTime(date(c, 4));     // 四级发证时间
+            o.setLevelFiveTime(date(c, 5));     // 五级发证时间
+
+            // 根据姓名查找组织ID和名称
+            if (personName != null && !personName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
+                if (!orgInfo.isEmpty()) {
+                    o.setUserId((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);
+        }
+        qualificationLevelService.batchInsert(list);
+        return list.size();
+    }
 }

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

@@ -0,0 +1,40 @@
+package com.sundot.airport.ledger.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.ledger.domain.LedgerQualificationLevel;
+import com.sundot.airport.ledger.mapper.LedgerQualificationLevelMapper;
+import com.sundot.airport.ledger.service.ILedgerQualificationLevelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * 职业资格等级获取时间Service实现
+ */
+@Service
+public class LedgerQualificationLevelServiceImpl extends ServiceImpl<LedgerQualificationLevelMapper, LedgerQualificationLevel>
+        implements ILedgerQualificationLevelService {
+
+    @Autowired
+    private LedgerQualificationLevelMapper mapper;
+
+    @Override
+    public List<LedgerQualificationLevel> selectList(LedgerQualificationLevel query) {
+        return mapper.selectList(query);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int batchInsert(List<LedgerQualificationLevel> list) {
+        if (list == null || list.isEmpty()) {
+            return 0;
+        }
+        list.forEach(item -> item.setCreateTime(DateUtils.getNowDate()));
+        saveBatch(list, 500);
+        return list.size();
+    }
+
+}

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

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sundot.airport.ledger.mapper.LedgerQualificationLevelMapper">
+
+    <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerQualificationLevel">
+        <id property="id" column="id" />
+        <result property="userId" column="user_id" />
+        <result property="deptId" column="dept_id" />
+        <result property="teamId" column="team_id" />
+        <result property="groupId" column="group_id" />
+        <result property="personName" column="person_name" />
+        <result property="deptName" column="dept_name" />
+        <result property="teamName" column="team_name" />
+        <result property="groupName" column="group_name" />
+        <result property="levelOneTime" column="level_one_time" />
+        <result property="levelTwoTime" column="level_two_time" />
+        <result property="levelThreeTime" column="level_three_time" />
+        <result property="levelFourTime" column="level_four_time" />
+        <result property="levelFiveTime" column="level_five_time" />
+        <result property="remark" column="remark" />
+        <result property="importBatch" column="import_batch" />
+        <result property="sourceType" column="source_type" />
+        <result property="createBy"   column="create_by"   />
+        <result property="createTime" column="create_time" />
+        <result property="updateBy"   column="update_by"   />
+        <result property="updateTime" column="update_time" />
+        <result property="syncFlag" column="sync_flag" />
+    </resultMap>
+
+    <sql id="selectVo">
+        SELECT id, user_id, dept_id, team_id, group_id, person_name, dept_name, team_name, group_name, 
+               level_one_time, level_two_time, level_three_time, level_four_time, level_five_time,
+               remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
+        FROM ledger_qualification_level
+        WHERE del_flag = '0'
+    </sql>
+
+    <select id="selectList" parameterType="com.sundot.airport.ledger.domain.LedgerQualificationLevel" resultMap="BaseResultMap">
+        <include refid="selectVo"/>
+        <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</if>
+        <if test="deptName != null and deptName != ''">AND dept_name LIKE CONCAT('%', #{deptName}, '%')</if>
+        <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 create_time &gt;= #{params.beginTime}
+        </if>
+        <if test="params != null and params.endTime != null and params.endTime != ''">
+            AND create_time &lt;= #{params.endTime}
+        </if>
+        ORDER BY id DESC
+    </select>
+
+    <update id="updateSyncFlag">
+        UPDATE ledger_qualification_level
+        SET sync_flag = '1'
+        WHERE sync_flag = '0'
+    </update>
+</mapper>