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
40521895
Commit
40521895
authored
Aug 30, 2024
by
位宇华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码提交
parent
aab811ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
ruoyi-wages/src/main/java/com/ruoyi/system/controller/SalaryCurrentRuleController.java
.../ruoyi/system/controller/SalaryCurrentRuleController.java
+2
-2
ruoyi-wages/src/main/java/com/ruoyi/system/service/SalaryCurrentRuleService.java
...va/com/ruoyi/system/service/SalaryCurrentRuleService.java
+1
-1
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/SalaryCurrentRuleServiceImpl.java
...oyi/system/service/impl/SalaryCurrentRuleServiceImpl.java
+1
-1
No files found.
ruoyi-wages/src/main/java/com/ruoyi/system/controller/SalaryCurrentRuleController.java
View file @
40521895
...
@@ -19,7 +19,7 @@ public class SalaryCurrentRuleController {
...
@@ -19,7 +19,7 @@ public class SalaryCurrentRuleController {
}
}
@PostMapping
(
"/current/rule/salary"
)
@PostMapping
(
"/current/rule/salary"
)
public
AjaxResult
get
Lj
tRuleSalary
(
@RequestBody
List
<
NewRuleSalaryRequestModel
>
newRuleSalaryRequestModelList
){
public
AjaxResult
get
Curren
tRuleSalary
(
@RequestBody
List
<
NewRuleSalaryRequestModel
>
newRuleSalaryRequestModelList
){
return
salaryCurrentRuleService
.
get
Lj
tRuleSalary
(
newRuleSalaryRequestModelList
);
return
salaryCurrentRuleService
.
get
Curren
tRuleSalary
(
newRuleSalaryRequestModelList
);
}
}
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/SalaryCurrentRuleService.java
View file @
40521895
...
@@ -6,5 +6,5 @@ import com.ruoyi.system.model.newrulesalary.NewRuleSalaryRequestModel;
...
@@ -6,5 +6,5 @@ import com.ruoyi.system.model.newrulesalary.NewRuleSalaryRequestModel;
import
java.util.List
;
import
java.util.List
;
public
interface
SalaryCurrentRuleService
{
public
interface
SalaryCurrentRuleService
{
AjaxResult
get
Lj
tRuleSalary
(
List
<
NewRuleSalaryRequestModel
>
newRuleSalaryRequestModelList
);
AjaxResult
get
Curren
tRuleSalary
(
List
<
NewRuleSalaryRequestModel
>
newRuleSalaryRequestModelList
);
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/SalaryCurrentRuleServiceImpl.java
View file @
40521895
...
@@ -27,7 +27,7 @@ public class SalaryCurrentRuleServiceImpl implements SalaryCurrentRuleService {
...
@@ -27,7 +27,7 @@ public class SalaryCurrentRuleServiceImpl implements SalaryCurrentRuleService {
}
}
@Override
@Override
public
AjaxResult
get
Lj
tRuleSalary
(
List
<
NewRuleSalaryRequestModel
>
newRuleSalaryRequestModelList
)
{
public
AjaxResult
get
Curren
tRuleSalary
(
List
<
NewRuleSalaryRequestModel
>
newRuleSalaryRequestModelList
)
{
Optional
<
List
<
NewRuleSalaryRequestModel
>>
optional
=
Optional
.
ofNullable
(
newRuleSalaryRequestModelList
);
Optional
<
List
<
NewRuleSalaryRequestModel
>>
optional
=
Optional
.
ofNullable
(
newRuleSalaryRequestModelList
);
optional
.
ifPresent
(
v
->
{
optional
.
ifPresent
(
v
->
{
String
mineCode
=
newRuleSalaryRequestModelList
.
get
(
0
).
getMineid
();
String
mineCode
=
newRuleSalaryRequestModelList
.
get
(
0
).
getMineid
();
...
...
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