diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java index ca70f12..b4d93e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java @@ -9,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; import java.util.List; /** @@ -67,4 +68,9 @@ public class HitRegInfo extends BaseEntity @TableField(exist = false) private List teacherInfoList; + /** 大赛时间 */ + @Excel(name = "大赛时间") + private Date createTime; + + } diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml index 9e45b94..900abed 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml @@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sample_number = #{sampleNumber} and sample_address = #{sampleAddress} and upload_file = #{uploadFile} + and create_time LIKE concat('%', date_format(#{createTime}, '%Y'), '%') order by audit_status asc,create_time desc