Skip to content

Y
yifu-mvp
Commit b481c628 authored by huyuchen's avatar huyuchen
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5

parents ea830c39 f624a88b
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TAverageSalaryMapper.xml
View file @ b481c628
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
, round(sum(a.RELAY_SALARY) / ifnull(count(DISTINCT a.SALARY_MONTH), 1), 2) AVERAGE_SALARY , round(sum(a.RELAY_SALARY) / ifnull(count(DISTINCT a.SALARY_MONTH), 1), 2) AVERAGE_SALARY
, DATE_FORMAT(now(), '%Y%m') CREATE_MONTH , DATE_FORMAT(now(), '%Y%m') CREATE_MONTH
from t_salary_account a from t_salary_account a
where a.SALARY_MONTH >= date_format(DATE_SUB(NOW(), INTERVAL 1 YEAR), '%Y%m') where a.DELETE_FLAG=0 and a.SALARY_MONTH >= date_format(DATE_SUB(NOW(), INTERVAL 1 YEAR), '%Y%m')
GROUP BY a.EMP_IDCARD GROUP BY a.EMP_IDCARD
</insert> </insert>
......
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