提交

username@email.com

2021-06-04 10b700dad2a510b83a5066aa5002dea8f4eb0e38

 zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs

@@ -185,12 +185,17 @@
        public IActionResult EditMemoBook(string Rtype="1" , string id = "0") 
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["users"] = _userService.GetList();
            ViewData["users"] = _userService.GetList().Where(x=>x.Id != curentuser.Id).ToList();
            AdmMemoBookDTO admMemoBookDTO = _DailyManageService.GetMemoBook(id);
            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
                Rtype = string.IsNullOrEmpty(admMemoBookDTO.Rtype)? Rtype : admMemoBookDTO.Rtype;
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
                Rtype = string.IsNullOrEmpty(admMemoBookDTO.Rtype) ? Rtype : admMemoBookDTO.Rtype;
            }
            ViewData.Model = admMemoBookDTO;
            ViewBag.Rtype = Rtype;
@@ -221,7 +226,7 @@
        [HttpPost]
        public string SaveMemoBook(AdmMemoBookDTO memoBook)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));            
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            memoBook.RecStatus = "A";
            if (String.IsNullOrEmpty(memoBook.Id))
            {
@@ -317,7 +322,8 @@
        public IActionResult EditWorkAnPai( string id = "")
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["users"] = _userService.GetList();
            ViewData["curentuser"] = curentuser;
            ViewData["users"] = _userService.GetList().Where(x => x.Id != curentuser.Id).ToList();
            AdmMemoBookDTO admMemoBookDTO = new AdmMemoBookDTO();
            if (!string.IsNullOrEmpty(id))
            {
@@ -325,9 +331,14 @@
                admMemoBookDTO.WorkDept = _userService.GetPltUserEntity(admMemoBookDTO.ToUserId).DeptId;
            }
            
            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;
            ViewData["Dept"] = _hrDeptService.GetList();
@@ -389,9 +400,14 @@
                admMemoBookDTO.WorkDept = _userService.GetPltUserEntity(admMemoBookDTO.ToUserId).DeptId;
            }

            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;
            ViewBag.KaoHe = _liaotianService.GetSYScode("ADM_MemoBook", "KaoHe");
@@ -506,9 +522,14 @@
                admMemoBookDTO = _DailyManageService.GetMemoBook(id);
            }

            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;
            ViewBag.Rtype = _liaotianService.GetSYScode("ADM_MemoBook", "Rtype").Where(x=>x.CodeSn=="2" || x.CodeSn == "4").ToList();
@@ -571,9 +592,14 @@
                admMemoBookDTO.WorkDept = _userService.GetPltUserEntity(admMemoBookDTO.ToUserId).DeptId;
            }

            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;
           
@@ -623,9 +649,14 @@
                admMemoBookDTO.WorkDept = _userService.GetPltUserEntity(admMemoBookDTO.ToUserId).DeptId;
            }

            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;