工作交接

username@email.com

2021-08-27 7b9e068cfe4e295f9ee960457d848c631f0136c7

 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
                    {
@@ -772,14 +791,15 @@
            DateTime st = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date;
            DateTime et = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1); 
            int month = 0;
            if (!string.IsNullOrEmpty(searchEntity.searchDate))
            if (!string.IsNullOrEmpty(searchEntity.searchDatestart))
            {
                var times = searchEntity.searchDate.Split('|');
                if (times.Length == 2)
                {
                    st = DateTime.Parse(times[0]);
                    et= DateTime.Parse(times[1]);
                }
                st = DateTime.Parse(searchEntity.searchDatestart + "-01");
                 
            }
            if (!string.IsNullOrEmpty(searchEntity.searchDateend))
            {
                et = DateTime.Parse(searchEntity.searchDateend + "-01");

            }
            var query = (from a in _context.HrSalaries where a.Year >= st.Year && a.Month >= st.Month && a.Year <= et.Year && a.Month <= et.Month select a);

@@ -790,7 +810,10 @@
                          && (string.IsNullOrWhiteSpace(searchEntity.Usernumber) || f.Usernumber == searchEntity.Usernumber.Trim())
                            && (string.IsNullOrWhiteSpace(searchEntity.DeptId) || f.DeptId == searchEntity.DeptId.Trim())
                              && (string.IsNullOrWhiteSpace(searchEntity.UserName) || f.UserName.Contains(searchEntity.UserName.Trim()))
                         select new HrSalaryDTO

                               && (string.IsNullOrWhiteSpace(searchEntity.UserId) || a.Userid.Contains(searchEntity.UserId.Trim()))

                        select new HrSalaryDTO
                         {
                             Id = a.Id,