Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chuanshan_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
廖旭伟
chuanshan_gov_platform
Commits
d2b85cdb
Commit
d2b85cdb
authored
Jun 05, 2023
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
事项申请列表查询条件增加申请时间
parent
8a03b628
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
10 deletions
+12
-10
knowledge-base/src/main/resources/bootstrap.yml
knowledge-base/src/main/resources/bootstrap.yml
+2
-5
single-matter/src/main/java/com/mortals/xhx/module/apply/model/MatterApplyEntity.java
...com/mortals/xhx/module/apply/model/MatterApplyEntity.java
+3
-0
single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyVo.java
.../com/mortals/xhx/module/apply/model/vo/MatterApplyVo.java
+5
-0
single-matter/src/main/resources/bootstrap.yml
single-matter/src/main/resources/bootstrap.yml
+2
-5
No files found.
knowledge-base/src/main/resources/bootstrap.yml
View file @
d2b85cdb
...
...
@@ -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
...
...
single-matter/src/main/java/com/mortals/xhx/module/apply/model/MatterApplyEntity.java
View file @
d2b85cdb
...
...
@@ -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不通过
...
...
single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyVo.java
View file @
d2b85cdb
...
...
@@ -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
single-matter/src/main/resources/bootstrap.yml
View file @
d2b85cdb
...
...
@@ -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@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment