提交

username@email.com

2021-08-11 8f735d11a4f03a4af3732eb97358ba6c350997a6

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -1728,7 +1728,8 @@
                    hrSalaryDTO.Dianhuafei = SimCost.bill_amount;
                }
              
                if(admAttendanceDTO.Shijichuqin>=admAttendanceDTO.Yingchuqin)
                if(admAttendanceDTO.Shijichuqin>=admAttendanceDTO.Yingchuqin
                    && hrSalaryDTO.Queqin <=0)
                {
                    hrSalaryDTO.Quanqinjiang = hrJibengongzi.Quanqingjiang;
                }
@@ -3597,7 +3598,7 @@
                        hrSalaryDTO.Yufagongziheji = hrSalaryDTOlast.Yufagongziheji;
                    }

                    hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Daozhanggongzi- hrSalaryDTO.Yufagongzi);
                    hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Yufagongzi - hrSalaryDTO.Daozhanggongzi );
                    if (hrSalaryDTO.Daozhanggongzi < hrSalaryDTO.Yufagongzi)
                    {
                        hrSalaryDTO.Daozhanggongzi = hrSalaryDTO.Yufagongzi;