username@email.com
2021-08-10 e75fce6031773dabf64d3ef019189c2362069c45
Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
1个文件已修改
25 ■■■■ 已修改文件
zhengcaioa/Services/HrSalaryService.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/HrSalaryService.cs
@@ -136,19 +136,38 @@
                    //计算预发工资
                    if (user.advancewages.HasValue && user.advancewages.Value>0)
                    {
                        //上一次的工资
                        var bf= _context.HrSalaries.Where(c => c.Userid == user.Id && c.Islock== "Q" && c.RecStatus=="A").
                            OrderByDescending(c=>c.Year).ThenByDescending(c=>c.Month).FirstOrDefault();
                        var pc = user.advancewages.Value;
                        if (sum_f - sum_k > pc)
                        {
                            updatepltRole.Daozhanggongzi = sum_f - sum_k;
                            updatepltRole.Daozhanggongzi = sum_f - sum_k;
                            updatepltRole.Yufagongzi = 0;
                            if(bf!=null)
                            {
                                updatepltRole.Yufagongziheji = bf.Yufagongziheji??0 - (updatepltRole.Daozhanggongzi-pc);
                            }
                            else
                            {
                                updatepltRole.Yufagongziheji = (pc - updatepltRole.Daozhanggongzi);
                            }
                        }
                        else
                        {
                            //预发
                            updatepltRole.Daozhanggongzi = pc;
                            updatepltRole.Yufagongzi = pc - (sum_f - sum_k);
                            updatepltRole.Yufagongziheji += updatepltRole.Yufagongzi;
                            if (bf != null)
                            {
                                updatepltRole.Yufagongziheji =bf.Yufagongziheji??0+ updatepltRole.Yufagongzi;
                            }
                            else
                            {
                                updatepltRole.Yufagongziheji = updatepltRole.Yufagongzi;
                            }
                        }
                    }
                    else
                    {