Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
项目统一框架
amos-boot-biz
Commits
e8470581
Commit
e8470581
authored
Jul 08, 2021
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1,修复日期为%Y-%m-%d
parent
7af83d62
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
DutyPersonShiftMapper.xml
...n-api/src/main/resources/mapper/DutyPersonShiftMapper.xml
+1
-1
DutyCommonServiceImpl.java
...module/common/biz/service/impl/DutyCommonServiceImpl.java
+1
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DutyPersonShiftMapper.xml
View file @
e8470581
...
...
@@ -74,7 +74,7 @@
</select>
<select
id=
"genRangeDate"
resultType=
"map"
>
SELECT
DATE
( DATE_ADD( #{beginDate}, INTERVAL @s DAY )
) AS date,
DATE
_FORMAT(DATE( DATE_ADD( #{beginDate}, INTERVAL @s DAY )),'%Y-%m-%d'
) AS date,
@s := @s + 1 AS `index`
FROM
mysql.help_topic,
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java
View file @
e8470581
...
...
@@ -89,6 +89,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
return
rangeDate
.
stream
().
map
(
p
->
{
Map
<
String
,
Object
>
result
=
new
LinkedHashMap
<>();
result
.
put
(
"key"
,
p
.
get
(
"date"
));
result
.
put
(
"viewType"
,
viewTypeEnum
.
getCode
());
result
.
put
(
"data"
,
this
.
buildViewData
(
viewTypeEnum
,
p
.
get
(
"date"
).
toString
(),
RequestContext
.
getAppKey
()));
return
result
;
}).
collect
(
Collectors
.
toList
());
...
...
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