yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tsg' into tsg

master
wany 2024-09-26 13:52:44 +08:00
parent 2656d0e722 350c6b486a
commit d3af35455b
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java
View File

@ -111,11 +111,11 @@ public class SzRegulatoryFrameworkController extends AbstractCommonFileControlle
} }
if (Objects.nonNull(page.getStm())) { if (Objects.nonNull(page.getStm())) {
query.ge(SzRegulatoryFramework::getCreateTime, page.getStm()); query.ge(SzRegulatoryFramework::getReleaseDate, page.getStm());
} }
if (Objects.nonNull(page.getEtm())) { if (Objects.nonNull(page.getEtm())) {
query.le(SzRegulatoryFramework::getCreateTime, page.getEtm()); query.le(SzRegulatoryFramework::getReleaseDate, page.getEtm());
} }
query.orderByDesc(SzRegulatoryFramework::getCreateTime); query.orderByDesc(SzRegulatoryFramework::getCreateTime);

11
src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java
View File

@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.gunshi.core.dateformat.DateFormatString;
import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Insert;
import com.gunshi.project.xyt.validate.markers.Update; import com.gunshi.project.xyt.validate.markers.Update;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
@ -16,6 +18,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -60,6 +63,14 @@ public class SzRegulatoryFramework extends CommUpdate implements Serializable {
@Size(max = 50,message = "发布单位最大长度要小于 50") @Size(max = 50,message = "发布单位最大长度要小于 50")
private String fillUnit; private String fillUnit;
/**
* 发布日期
*/
@TableField(value="release_date")
@JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
@Schema(description="发布日期")
private Date releaseDate;
/** /**
* 制度类型 * 制度类型
*/ */