Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
f27d237b
Commit
f27d237b
authored
Jun 26, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5
parents
99589ea6
5923f256
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
TConfigSalaryController.java
...us/v1/yifu/salary/controller/TConfigSalaryController.java
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TConfigSalaryController.java
View file @
f27d237b
...
...
@@ -74,7 +74,7 @@ public class TConfigSalaryController {
// 当前年 未推送或未发放的 发薪次数
int
yearCount
=
tSalaryStandardService
.
getNum
(
settleDepart
,
null
,
nowYear
);
for
(
TConfigSalary
cs
:
configSalaryList
)
{
if
(
cs
.
getSalaryNum
()
<
monthCount
)
{
if
(
cs
.
getSalaryNum
()
<
=
monthCount
)
{
cs
.
setNowMonthSalaryNum
(
monthCount
);
}
cs
.
setNowYearSalaryNum
(
yearCount
);
...
...
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