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
9fcd4432
Commit
9fcd4432
authored
Aug 30, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消息提醒优化
parent
3673b693
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
SysMessageSalaryController.java
...v1/yifu/salary/controller/SysMessageSalaryController.java
+1
-1
SysMessageSalaryMapper.xml
...-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/SysMessageSalaryController.java
View file @
9fcd4432
...
@@ -76,7 +76,7 @@ public class SysMessageSalaryController {
...
@@ -76,7 +76,7 @@ public class SysMessageSalaryController {
**/
**/
@Inner
@Inner
@Operation
(
description
=
"生成最低工资提醒"
)
@Operation
(
description
=
"生成最低工资提醒"
)
@
Ge
tMapping
(
"/inner/createSysMessageSalary"
)
@
Pos
tMapping
(
"/inner/createSysMessageSalary"
)
public
void
createSysMessageSalary
()
{
public
void
createSysMessageSalary
()
{
//薪资月份
//薪资月份
String
salaryMonth
=
DateUtil
.
addMonth
(-
1
);
String
salaryMonth
=
DateUtil
.
addMonth
(-
1
);
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
View file @
9fcd4432
...
@@ -196,7 +196,7 @@
...
@@ -196,7 +196,7 @@
a.SETTLEMENT_MONTH settle_month,
a.SETTLEMENT_MONTH settle_month,
sum(i.SALARY_MONEY) AS actual_salary,
sum(i.SALARY_MONEY) AS actual_salary,
sum(l.SALARY_MONEY) AS relay_Salary,
sum(l.SALARY_MONEY) AS relay_Salary,
s.
createBy AS create_by
,
s.
CREATE_BY AS CREATE_BY
,
min(IFNULL(t.salary_base,c.salary_base)) AS salary_base,
min(IFNULL(t.salary_base,c.salary_base)) AS salary_base,
a.PROVINCE,
a.PROVINCE,
a.CITY,
a.CITY,
...
...
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