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
9f689033
Commit
9f689033
authored
Jun 19, 2024
by
Fuzy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正
parent
53c01f53
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
9 deletions
+10
-9
ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesConversionController.java
...om/ruoyi/system/controller/WagesConversionController.java
+2
-2
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesConversionMapper.java
...n/java/com/ruoyi/system/mapper/WagesConversionMapper.java
+1
-1
ruoyi-wages/src/main/java/com/ruoyi/system/service/WagesConversionService.java
...java/com/ruoyi/system/service/WagesConversionService.java
+1
-1
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesConversionServiceImpl.java
...ruoyi/system/service/impl/WagesConversionServiceImpl.java
+5
-4
ruoyi-wages/src/main/resources/mapper/system/WagesConversionMapper.xml
...rc/main/resources/mapper/system/WagesConversionMapper.xml
+1
-1
No files found.
ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesConversionController.java
View file @
9f689033
...
...
@@ -57,7 +57,7 @@ public class WagesConversionController extends BaseController {
}
@RequestMapping
(
"/recentFormulas"
)
public
AjaxResult
recentFormulas
(){
return
new
AjaxResult
(
200
,
"成功"
,
wagesConversionService
.
recentFormulas
());
public
AjaxResult
recentFormulas
(
@RequestBody
String
mineId
){
return
new
AjaxResult
(
200
,
"成功"
,
wagesConversionService
.
recentFormulas
(
mineId
));
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesConversionMapper.java
View file @
9f689033
...
...
@@ -23,5 +23,5 @@ public interface WagesConversionMapper {
void
deleteFromConversionToDate
(
@Param
(
"date"
)
String
yearMonth
);
List
<
WagesConversionDataVO
>
selectWagesValueAndDate
();
List
<
WagesConversionDataVO
>
selectWagesValueAndDate
(
@Param
(
"id"
)
String
mineId
);
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/WagesConversionService.java
View file @
9f689033
...
...
@@ -19,5 +19,5 @@ public interface WagesConversionService {
WagesConversionData
selectWagesConversionDataById
(
int
id
);
Object
recentFormulas
();
Object
recentFormulas
(
String
mineId
);
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesConversionServiceImpl.java
View file @
9f689033
...
...
@@ -51,8 +51,8 @@ public class WagesConversionServiceImpl implements WagesConversionService {
}
@Override
public
Object
recentFormulas
()
{
List
<
WagesConversionDataVO
>
list
=
wagesConversionMapper
.
selectWagesValueAndDate
();
public
Object
recentFormulas
(
String
mineId
)
{
List
<
WagesConversionDataVO
>
list
=
wagesConversionMapper
.
selectWagesValueAndDate
(
mineId
);
list
.
removeAll
(
Collections
.
singleton
(
null
));
boolean
b1
=
list
.
parallelStream
().
anyMatch
(
v
->
v
.
getYearMonth
()
==
null
||
v
.
getYearMonth
().
indexOf
(
"-"
)
<=
0
);
if
(
b1
)
return
"数据库中数据存在日期错误"
;
...
...
@@ -63,10 +63,11 @@ public class WagesConversionServiceImpl implements WagesConversionService {
}
else
{
return
"数据库中没有数据"
;
}
if
(
collect
!=
null
)
{
if
(
collect
.
size
()
!=
0
)
{
collect
=
collect
.
parallelStream
().
sorted
((
a
,
b
)
->
Integer
.
parseInt
(
b
.
getYearMonth
().
split
(
"-"
)[
1
])
-
Integer
.
parseInt
(
a
.
getYearMonth
().
split
(
"-"
)[
1
])).
collect
(
Collectors
.
toList
());
return
collect
.
get
(
0
).
getValue
();
}
return
collect
.
get
(
0
).
getValue
()
;
return
"数据库中数据错误"
;
}
}
ruoyi-wages/src/main/resources/mapper/system/WagesConversionMapper.xml
View file @
9f689033
...
...
@@ -39,7 +39,7 @@
</select>
<select
id=
"selectWagesValueAndDate"
resultType=
"com.ruoyi.system.model.wages.vo.WagesConversionDataVO"
>
select wage_month as yearMonth, value as value
from wages_conversion_data;
from wages_conversion_data
where mine_id = #{id}
;
</select>
<update
id=
"update"
>
...
...
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