Commit 9fcd4432 authored by fangxinjiang's avatar fangxinjiang

消息提醒优化

parent 3673b693
...@@ -76,7 +76,7 @@ public class SysMessageSalaryController { ...@@ -76,7 +76,7 @@ public class SysMessageSalaryController {
**/ **/
@Inner @Inner
@Operation(description = "生成最低工资提醒") @Operation(description = "生成最低工资提醒")
@GetMapping("/inner/createSysMessageSalary") @PostMapping("/inner/createSysMessageSalary")
public void createSysMessageSalary() { public void createSysMessageSalary() {
//薪资月份 //薪资月份
String salaryMonth = DateUtil.addMonth(-1); String salaryMonth = DateUtil.addMonth(-1);
......
...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment