Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
klck
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
位宇华
klck
Commits
4851c837
Commit
4851c837
authored
Jul 10, 2024
by
刘_震
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改实体类的类型,接受小数类型以及优化代码
parent
46426fc3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
18 deletions
+26
-18
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesMaterialDetails.java
...a/com/ruoyi/system/domain/ActSuppliesMaterialDetails.java
+1
-1
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/AsiccSuppliesServiceImpl.java
...m/ruoyi/system/service/impl/AsiccSuppliesServiceImpl.java
+25
-17
No files found.
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesMaterialDetails.java
View file @
4851c837
...
...
@@ -29,7 +29,7 @@ public class ActSuppliesMaterialDetails {
private
String
departmentColumn
;
//数量
@JsonProperty
(
value
=
"NumberColumn"
)
private
Long
numberColumn
;
private
BigDecimal
numberColumn
;
//单价
@JsonProperty
(
value
=
"MoneyColumn"
)
private
BigDecimal
moneyColumn
;
...
...
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/AsiccSuppliesServiceImpl.java
View file @
4851c837
...
...
@@ -25,6 +25,7 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
@Override
public
Map
<
String
,
Object
>
getData
(
AsiccDAO
asiccDAO
)
{
long
begin
=
System
.
currentTimeMillis
();
//建立一个map集合用于存储返回的数据
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
...
...
@@ -45,6 +46,15 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
List
<
ActSupplies
>
suppliesList
=
asiccSuppliesMapper
.
select
();
List
<
ActSupplies
>
accInfos
=
asiccSuppliesMapper
.
selectByCodeAndMineId
(
mineId
,
filteredCodes
);
for
(
ActSupplies
accInfo
:
accInfos
)
{
List
<
String
>
voList
=
getList
(
accInfo
,
suppliesList
);
map
.
put
(
accInfo
.
getCodeColumn
(),
voList
);
}
long
end
=
System
.
currentTimeMillis
();
System
.
err
.
println
(
end
-
begin
);
return
map
;
}
private
static
List
<
String
>
getList
(
ActSupplies
accInfo
,
List
<
ActSupplies
>
suppliesList
)
{
List
<
String
>
voList
=
new
ArrayList
<>();
Long
level
=
accInfo
.
getLevel
();
if
(
level
==
1
)
{
...
...
@@ -62,8 +72,6 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
}
}
}
map
.
put
(
accInfo
.
getCodeColumn
(),
voList
);
}
return
map
;
return
voList
;
}
}
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