Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-store
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-store
Commits
b69eb932
Commit
b69eb932
authored
May 29, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改YYYY为yyyy
parent
fff72a63
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
Constants.java
...e-api/src/main/java/com/gic/store/constant/Constants.java
+1
-1
StoreFieldDateEnum.java
.../main/java/com/gic/store/constant/StoreFieldDateEnum.java
+3
-3
StoreController.java
...in/java/com/gic/store/web/controller/StoreController.java
+10
-10
No files found.
gic-store-api/src/main/java/com/gic/store/constant/Constants.java
View file @
b69eb932
...
...
@@ -11,7 +11,7 @@ public interface Constants {
Integer
STORE_BATCH_IMPORT_TASK_TYPE
=
6
;
Integer
CLERK_BATCH_IMPORT_TASK_TYPE
=
8
;
String
dateformat
=
"
YYYY
-MM-dd HH:mm:ss"
;
String
dateformat
=
"
yyyy
-MM-dd HH:mm:ss"
;
// enterprise:store:${enterpriseId}:#{storeId}
String
STORE_KEY
=
"enterprise:store:"
;
// 小程序默认图片
...
...
gic-store-api/src/main/java/com/gic/store/constant/StoreFieldDateEnum.java
View file @
b69eb932
...
...
@@ -7,10 +7,10 @@ package com.gic.store.constant;
* @date 2019/7/2 4:34 PM
*/
public
enum
StoreFieldDateEnum
{
YMD
(
1
,
"年月日"
,
"
YYYY
-MM-dd"
),
YM
(
2
,
"年月"
,
"
YYYY
-MM"
),
YMD
(
1
,
"年月日"
,
"
yyyy
-MM-dd"
),
YM
(
2
,
"年月"
,
"
yyyy
-MM"
),
MD
(
3
,
"月日"
,
"MM-dd"
),
YMDHMS
(
4
,
"年月日时分秒"
,
"
YYYY
-MM-dd HH:mm:ss"
),
YMDHMS
(
4
,
"年月日时分秒"
,
"
yyyy
-MM-dd HH:mm:ss"
),
Hms
(
5
,
"时分秒"
,
"HH:mm:ss"
);
private
int
code
;
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
View file @
b69eb932
...
...
@@ -768,22 +768,22 @@ public class StoreController extends DownloadUtils {
SimpleDateFormat
simpleDateFormat
=
map
.
get
(
dateType
);
if
(
simpleDateFormat
==
null
){
if
(
StoreFieldDateEnum
.
YMDHMS
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
-MM-dd HH:mm:ss"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
-MM-dd HH:mm:ss"
);
}
if
(
StoreFieldDateEnum
.
YMD
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
-MM-dd"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
-MM-dd"
);
}
if
(
StoreFieldDateEnum
.
YM
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
-MM"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
-MM"
);
}
if
(
StoreFieldDateEnum
.
MD
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"MM-dd"
);
}
if
(
StoreFieldDateEnum
.
Hms
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
-MM-dd HH:mm:ss"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
-MM-dd HH:mm:ss"
);
}
if
(
simpleDateFormat
==
null
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
-MM-dd"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
-MM-dd"
);
}
map
.
put
(
dateType
,
simpleDateFormat
);
}
...
...
@@ -794,22 +794,22 @@ public class StoreController extends DownloadUtils {
SimpleDateFormat
simpleDateFormat
=
map1
.
get
(
dateType
);
if
(
simpleDateFormat
==
null
){
if
(
StoreFieldDateEnum
.
YMDHMS
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
MMddHHmmss"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
MMddHHmmss"
);
}
if
(
StoreFieldDateEnum
.
YMD
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
MMdd"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
MMdd"
);
}
if
(
StoreFieldDateEnum
.
YM
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
MM"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
MM"
);
}
if
(
StoreFieldDateEnum
.
MD
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"MMdd"
);
}
if
(
StoreFieldDateEnum
.
Hms
.
getCode
()
==
dateType
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
MMddHHmmss"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
MMddHHmmss"
);
}
if
(
simpleDateFormat
==
null
){
simpleDateFormat
=
new
SimpleDateFormat
(
"
YYYY
MMdd"
);
simpleDateFormat
=
new
SimpleDateFormat
(
"
yyyy
MMdd"
);
}
map1
.
put
(
dateType
,
simpleDateFormat
);
}
...
...
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