今日开发 考勤规则里增加 公司安排加班 调整请假时间计算 加班日考勤计算

username@email.com

2021-07-27 072169e3c5446f94e2cf4e570e5c7952bb5b15b9

 zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs

@@ -104,7 +104,7 @@


        /// <summary>
        /// 保存申诉
        /// 保存费用申请
        /// </summary>
        /// <param name="data"></param>
        /// <returns></returns>
@@ -215,7 +215,7 @@


        /// <summary>
        /// 保存申诉
        /// 保存物品申领
        /// </summary>
        /// <param name="data"></param>
        /// <returns></returns>
@@ -272,5 +272,116 @@
            }
            return new JsonResult(resultEntity);
        }



        public IActionResult Askovertime(string id = "")
        {
            AdmAskovertimeDTO dto = new AdmAskovertimeDTO();
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));


            //流程相关
            string shifoubiaoji = "A";
            string sifoudangqian = "A";
            string dangqianbuzhou = "提交";
            var lishiyijian = new List<WfHistoryDTO>();

            if (string.IsNullOrEmpty(id))
            {
                dto.CreaterName = curentuser.UserName;
                dto.Tittle = "加班申请（" + curentuser.UserName + "）";
            }
            else if (dto != null)
            {
                dto = _askService.GetAskovertime(id);
                dto.OvertimeName = dto.Overtime.Value.ToString("0.##");
                dto.JiabantimeName = dto.Jiabantime.Value.ToString("yyyy-MM-dd");

                var wfRunProcessDTO = _wfRunProcessService.GetList(dto.Id, "10").FirstOrDefault();
                if (wfRunProcessDTO == null)
                {
                    shifoubiaoji = "D";
                    sifoudangqian = "D";
                }
                else
                {
                    dangqianbuzhou = wfRunProcessDTO.Step;
                    //查询历史意见
                    lishiyijian = _wfHistoryService.GetListshenpi(wfRunProcessDTO.Id);
                    if (wfRunProcessDTO.Step != "提交")
                    {
                        shifoubiaoji = "D";
                    }

                    //查询待办
                    var chaxundaiban = _wfNeeddeelService.GetListTracking(wfRunProcessDTO.Id, wfRunProcessDTO.Step).Where(x => x.DeelUserId == curentuser.Id).ToList();
                    if (chaxundaiban != null && chaxundaiban.Count > 0)
                    {
                        sifoudangqian = "A";
                    }
                    else
                    {
                        sifoudangqian = "D";
                    }

                }




            }

            ViewBag.shifoubiaoji = shifoubiaoji;
            ViewBag.sifoudangqian = sifoudangqian;
            ViewBag.lishiyijian = lishiyijian;
            ViewBag.dangqianbuzhou = dangqianbuzhou;

            ViewData.Model = dto;
            return View();
        }


        /// <summary>
        /// 保存费用申请
        /// </summary>
        /// <param name="data"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult Askovertime(AdmAskovertimeDTO data)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ResultEntity resultEntity = new ResultEntity();
            using (TransactionScope scope = new TransactionScope())
            {
                if (data.Step == "提交")
                {

                    data.ShenpiStatus = "D";
                    data.RecStatus = "A";
                    data.Creater = curentuser.Id;
                    data.Createtime = DateTime.Now;
                    data.Modifier = data.Creater;
                    data.Modifytime = data.Createtime;

                    resultEntity = _askService.SaveAskovertime(data);
                    if (!resultEntity.Result)
                    {
                        return new JsonResult(resultEntity);
                    }
                }


                //发起流程相关

                resultEntity = _wfRunProcessService.WfAskovertime(data.Id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.Tittle, "v1");
                if (!resultEntity.Result)
                {
                    return new JsonResult(resultEntity);
                }
                scope.Complete();
            }
            return new JsonResult(resultEntity);
        }
    }
}