工资绩效改版

username@email.com

2023-02-28 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -532,8 +532,12 @@
                                    {
                                        endttime = dateBiJiaoDTOs[i].EndTime;
                                    }
                                    if (!starttime.HasValue)
                                    {
                                        starttime = dateBiJiaoDTOs[i].StartTime;
                                    }
                                }
                                if (endttime >= StratTimeWorkingEnd)
                                if (endttime >= StratTimeWorkingEnd && starttime.HasValue)
                                {
                                    break;
                                }
@@ -654,8 +658,12 @@
                                    {
                                        endttime = dateBiJiaoDTOs[i].EndTime;
                                    }
                                    if (!starttime.HasValue)
                                    {
                                        starttime = dateBiJiaoDTOs[i].StartTime;
                                    }
                                }
                                if (endttime >= StratTimeOffworkEnd)
                                if (endttime >= StratTimeOffworkEnd && starttime.HasValue)
                                {
                                    break;
                                }
@@ -992,6 +1000,10 @@
                                        {
                                            endttime = dateBiJiaoDTOs[i].EndTime;
                                        }
                                        if (!starttime.HasValue)
                                        {
                                            starttime = dateBiJiaoDTOs[i].StartTime;
                                        }
                                    }
                                }
                                if (kuanggong)
@@ -1109,6 +1121,10 @@
                                        if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
                                        {
                                            endttime = dateBiJiaoDTOs[i].EndTime;
                                        }
                                        if (!starttime.HasValue)
                                        {
                                            starttime = dateBiJiaoDTOs[i].StartTime;
                                        }
                                    }
                                }
@@ -1659,7 +1675,12 @@
                                hrSalaryDTO.Queqin += queqingkoukuan;
                            }
                        }
                        hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * userList[i].ShiyongPrice.Value, 2);
                        if (hrJibengongzi.Jiabangongzi.HasValue)
                        {
                            hrSalaryDTO.Jiabangongzi += Math.Round(admAttendanceDTO.Jiaban * hrJibengongzi.Jiabangongzi.Value, 2);  //(admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * userList[i].ShiyongPrice.Value
                        }

                       

                        //工作评价不合格罚款
                        hrSalaryDTO.Fakuan += Math.Round(userList[i].ShiyongPrice.Value * admEvaluateDTOs.Count / admAttendanceDTO.Yingchuqin, 2);
@@ -1737,7 +1758,11 @@
                                hrSalaryDTO.Queqin += queqingkoukuan;
                            }
                        }
                        hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * BasicPrice, 2);
                        if (hrJibengongzi.Jiabangongzi.HasValue)
                        {
                            hrSalaryDTO.Jiabangongzi += Math.Round(admAttendanceDTO.Jiaban * hrJibengongzi.Jiabangongzi.Value, 2);  //   hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * BasicPrice, 2);
                        }
                     
                    }