Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
d9798019
Commit
d9798019
authored
Apr 10, 2023
by
songyinghui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 文件模板
parent
3b2c5f4b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
MaterialDataAdaptor.java
...e/web/controller/content/adaptor/MaterialDataAdaptor.java
+11
-2
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/MaterialDataAdaptor.java
View file @
d9798019
...
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
...
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.Page
;
import
com.gic.haoban.manage.api.enums.content.MaterialReportType
;
import
com.gic.haoban.manage.api.enums.content.MaterialReportType
;
import
com.gic.haoban.manage.web.qo.content.statistics.MaterialReportQO
;
import
com.gic.haoban.manage.web.qo.content.statistics.MaterialReportQO
;
...
@@ -342,10 +343,18 @@ public class MaterialDataAdaptor {
...
@@ -342,10 +343,18 @@ public class MaterialDataAdaptor {
return
new
Page
<>();
return
new
Page
<>();
}
}
Page
<
MaterialStoreUsedDataVO
>
pageResult
=
new
Page
<>();
Page
<
MaterialStoreUsedDataVO
>
pageResult
=
new
Page
<>();
List
<
MaterialStoreUsedDataVO
>
materialStoreUsedDataVOS
=
JSON
.
parseArray
(
JSON
.
toJSONString
(
result
.
get
(
"data"
)),
MaterialStoreUsedDataVO
.
class
);
List
<
MaterialStoreUsedDataVO
>
materialStoreUsedDataVOS
=
null
;
if
(
CollectionUtils
.
isEmpty
(
materialStoreUsedDataVOS
))
{
List
<
JSONObject
>
jsonObjects
=
JSON
.
parseArray
(
JSON
.
toJSONString
(
result
.
get
(
"data"
)),
JSONObject
.
class
);
if
(
CollectionUtils
.
isEmpty
(
jsonObjects
))
{
return
new
Page
<>();
return
new
Page
<>();
}
}
jsonObjects
.
stream
()
.
map
(
item
->
{
MaterialStoreUsedDataVO
temp
=
JSONObject
.
parseObject
(
item
.
toJSONString
(),
MaterialStoreUsedDataVO
.
class
);
//temp.setDayAvgUseMatlNum();
return
temp
;
})
.
collect
(
Collectors
.
toList
());
for
(
MaterialStoreUsedDataVO
materialStoreUsedDataVO
:
materialStoreUsedDataVOS
)
{
for
(
MaterialStoreUsedDataVO
materialStoreUsedDataVO
:
materialStoreUsedDataVOS
)
{
materialStoreUsedDataVO
.
setStartTime
(
startTime
);
materialStoreUsedDataVO
.
setStartTime
(
startTime
);
materialStoreUsedDataVO
.
setEndTime
(
endTime
);
materialStoreUsedDataVO
.
setEndTime
(
endTime
);
...
...
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