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

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

@@ -194,6 +194,13 @@ public class LedgerTemplateController extends BaseController {
 //            "问题台账日期","问题台账内容","具体问题","处理人","班组","二次复核问题","是否完成整改"
 //        });
 
+        // 21. 职业资格等级获取时间表 (6列)
+        nm.put("qualificationLevel", "职业资格等级获取时间表");
+        hm.put("qualificationLevel", 2);
+        cm.put("qualificationLevel", new String[]{
+            "姓名","一级发证时间","二级发证时间","三级发证时间","四级发证时间","五级发证时间"
+        });
+
         KEY_TO_SHEET = Collections.unmodifiableMap(nm);
         KEY_TO_HEADS = Collections.unmodifiableMap(hm);
         KEY_TO_COLS  = Collections.unmodifiableMap(cm);

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

@@ -3,6 +3,7 @@ package com.sundot.airport.ledger.domain;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -70,6 +71,16 @@ public class LedgerQualificationLevel extends BaseEntity {
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
+    /** 查询参数 - 开始时间（非数据库字段） */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date beginTime;
+
+    /** 查询参数 - 结束时间（非数据库字段） */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
 
@@ -123,4 +134,10 @@ public class LedgerQualificationLevel extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
+
+    public Date getBeginTime() { return beginTime; }
+    public void setBeginTime(Date beginTime) { this.beginTime = beginTime; }
+
+    public Date getEndTime() { return endTime; }
+    public void setEndTime(Date endTime) { this.endTime = endTime; }
 }

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

@@ -41,11 +41,11 @@
         <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 test="beginTime != null">
+            AND create_time &gt;= #{beginTime}
         </if>
-        <if test="params != null and params.endTime != null and params.endTime != ''">
-            AND create_time &lt;= #{params.endTime}
+        <if test="endTime != null">
+            AND create_time &lt;= #{endTime}
         </if>
         ORDER BY id DESC
     </select>