jiangwenjun
/
reference
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整时间返回

This commit is contained in:
xpecya 2024-12-15 16:57:07 +08:00
parent 6cdf895ea6
commit 2a7f65e577
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/AdminUserVO.java
View File

@ -35,13 +35,13 @@ public class AdminUserVO {
/** /**
* 用户创建时间 * 用户创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date createTime; private Date createTime;
/** /**
* 用户修改时间 * 用户修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date updateTime; private Date updateTime;
public AdminUserVO(AdminUser adminUser) { public AdminUserVO(AdminUser adminUser) {

4
admin/src/main/java/com/jinrui/reference/admin/model/vo/login/LoginVO.java
View File

@ -35,13 +35,13 @@ public class LoginVO {
/** /**
* 用户创建时间 * 用户创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date createTime; private Date createTime;
/** /**
* 用户修改时间 * 用户修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date updateTime; private Date updateTime;
public LoginVO(AdminUser adminUser) { public LoginVO(AdminUser adminUser) {

10
core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java
View File

@ -91,14 +91,14 @@ public interface NewsMapper {
"news.publish_time as publishTime," + "news.publish_time as publishTime," +
"news.update_time as updateTime " + "news.update_time as updateTime " +
"from news " + "from news " +
"<if test=\"column != null\">" + "<if test=\"column != null and !column.isEmpty()\">" +
"inner join news_column_rel on news.id = news_column_rel.news_id " + "inner join news_column_rel on news.id = news_column_rel.news_id " +
"</if>" + "</if>" +
"<where>" + "<where>" +
"<if test=\"keyword != null and !keyword.isEmpty()\">" + "<if test=\"keyword != null and !keyword.isEmpty()\">" +
"news.title like concat('%', #{keyword}, '%') " + "news.title like concat('%', #{keyword}, '%') " +
"</if>" + "</if>" +
"<if test=\"column != null\">" + "<if test=\"column != null and !column.isEmpty()\">" +
"and news_column_rel.column_id in (${column}) " + "and news_column_rel.column_id in (${column}) " +
"</if>" + "</if>" +
"<if test=\"status != null\">" + "<if test=\"status != null\">" +
@ -108,7 +108,7 @@ public interface NewsMapper {
"and news.id &gt; #{last}" + "and news.id &gt; #{last}" +
"</if>" + "</if>" +
"</where>" + "</where>" +
"order by concat('`', ${orderBy}, '`') " + "order by news.${orderBy} " +
"<if test=\"'desc'.equals(direction)\">" + "<if test=\"'desc'.equals(direction)\">" +
"desc" + "desc" +
"</if>" + "</if>" +
@ -125,14 +125,14 @@ public interface NewsMapper {
@Select("<script>" + @Select("<script>" +
"select count(*) from (select distinct news.* from news " + "select count(*) from (select distinct news.* from news " +
"<if test=\"column != null\">" + "<if test=\"column != null and !column.isEmpty() \">" +
"inner join news_column_rel on news.id = news_column_rel.news_id " + "inner join news_column_rel on news.id = news_column_rel.news_id " +
"</if>" + "</if>" +
"<where>" + "<where>" +
"<if test=\"keyword != null and !keyword.isEmpty()\">" + "<if test=\"keyword != null and !keyword.isEmpty()\">" +
"news.title like concat('%', #{keyword}, '%') " + "news.title like concat('%', #{keyword}, '%') " +
"</if>" + "</if>" +
"<if test=\"column != null\">" + "<if test=\"column != null and !column.isEmpty()\">" +
"and news_column_rel.column_id in (${column}) " + "and news_column_rel.column_id in (${column}) " +
"</if>" + "</if>" +
"<if test=\"status != null\">" + "<if test=\"status != null\">" +

4
core/src/main/java/com/jinrui/reference/core/model/vo/column/ColumnVO.java
View File

@ -31,13 +31,13 @@ public class ColumnVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date createTime; private Date createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date updateTime; private Date updateTime;
/** /**

6
core/src/main/java/com/jinrui/reference/core/model/vo/news/NewsVO.java
View File

@ -37,19 +37,19 @@ public class NewsVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date createTime; private Date createTime;
/** /**
* 发布时间 * 发布时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date publishTime; private Date publishTime;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date updateTime; private Date updateTime;
public NewsVO(News news) { public NewsVO(News news) {

4
core/src/main/java/com/jinrui/reference/core/model/vo/tag/TagVO.java
View File

@ -26,13 +26,13 @@ public class TagVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date createTime; private Date createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date updateTime; private Date updateTime;
/** /**