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
50f80c5f
Commit
50f80c5f
authored
Feb 10, 2025
by
xiehongfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修正合计的计算规则,
parent
8dbc3148
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
CanvasDataController.java
...oban/manage/web/controller/data/CanvasDataController.java
+12
-10
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/CanvasDataController.java
View file @
50f80c5f
...
...
@@ -161,17 +161,19 @@ public class CanvasDataController {
Map
<
String
,
Object
>
res
=
DataApiUtils
.
http
(
jsonObject
.
toJSONString
(),
"data_mkt_canvas_haoban_mkt_task"
);
Page
<
CanvasTaskVO
>
page
=
DataApiUtils
.
getPageData
(
res
,
CanvasTaskVO
.
class
);
List
<
CanvasTaskVO
>
list
=
page
.
getResult
();
if
(
qo
.
getPageNum
()
==
1
)
{
//合计
jsonObject
.
put
(
"dataType"
,
4
);
res
=
DataApiUtils
.
http
(
jsonObject
.
toJSONString
(),
"data_mkt_canvas_haoban_mkt_task"
);
JSONObject
total
=
DataApiUtils
.
getPageOne
(
res
);
total
.
put
(
isStore
?
"storeName"
:
"canvasName"
,
"合计"
);
if
(
CollectionUtils
.
isEmpty
(
list
))
{
list
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
if
(
qo
.
getPageNum
()
==
1
)
{
//合计
jsonObject
.
put
(
"dataType"
,
4
);
res
=
DataApiUtils
.
http
(
jsonObject
.
toJSONString
(),
"data_mkt_canvas_haoban_mkt_task"
);
JSONObject
total
=
DataApiUtils
.
getPageOne
(
res
);
total
.
put
(
isStore
?
"storeName"
:
"canvasName"
,
"合计"
);
if
(
CollectionUtils
.
isEmpty
(
list
))
{
list
=
new
ArrayList
<>();
}
list
.
add
(
0
,
JSONObject
.
parseObject
(
total
.
toJSONString
(),
CanvasTaskVO
.
class
));
page
.
setResult
(
list
);
}
list
.
add
(
0
,
JSONObject
.
parseObject
(
total
.
toJSONString
(),
CanvasTaskVO
.
class
));
page
.
setResult
(
list
);
}
return
RestResponse
.
successResult
(
page
);
}
...
...
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