Commit d2b85cdb authored by 廖旭伟's avatar 廖旭伟

事项申请列表查询条件增加申请时间

parent 8a03b628
......@@ -11,11 +11,8 @@ spring:
max-file-size: 500MB
max-request-size: 5000MB
jackson:
serialization:
WRITE_DATES_AS_TIMESTAMPS: true
default-property-inclusion: NON_NULL
# time-zone: GMT+8
# date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
dao:
exceptiontranslation:
enabled: false
......
......@@ -2,6 +2,8 @@ package com.mortals.xhx.module.apply.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
......@@ -64,6 +66,7 @@ public class MatterApplyEntity extends MatterApplyVo {
/**
* 申请时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
/**
* 审批状态0审批中1通过2不通过
......
......@@ -22,4 +22,9 @@ public class MatterApplyVo extends BaseEntityLong {
private Long userId;
private String keywords;
/** 开始 申请时间 */
private String applyTimeStart;
/** 结束 申请时间 */
private String applyTimeEnd;
}
\ No newline at end of file
......@@ -11,11 +11,8 @@ spring:
max-file-size: 500MB
max-request-size: 5000MB
jackson:
serialization:
WRITE_DATES_AS_TIMESTAMPS: true
default-property-inclusion: NON_NULL
# time-zone: GMT+8
# date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
# rabbitmq:
# host: @profiles.rabbitmq.host@
# port: @profiles.rabbitmq.port@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment