提交

username@email.com

2022-08-27 6e2b929cf381e2320ba6e7dec56c0371124d2b51

 zhengcaioa/zhengcaioa/Controllers/UserController.cs

@@ -24,9 +24,13 @@
        private readonly ILiaotianService _liaotianService;
        private readonly IPltJiatingchengyuanService _pltJiatingchengyuanService;
        private readonly ISysAttachmentService _sysAttachmentService;
        private readonly IPltRoleService _pltRoleService;
        private readonly IPltPageService _pltPageService;


        public UserController(ILogger<UserController> logger, IUserService userService, IHrDeptService hrDeptService, IHrPositionService hrPositionService, ILiaotianService liaotianService, IPltJiatingchengyuanService pltJiatingchengyuanService, ISysAttachmentService sysAttachmentService)
        public UserController(ILogger<UserController> logger, IUserService userService, IHrDeptService hrDeptService, IHrPositionService hrPositionService, ILiaotianService liaotianService, IPltJiatingchengyuanService pltJiatingchengyuanService, ISysAttachmentService sysAttachmentService
            , IPltRoleService pltRoleService
             , IPltPageService pltPageService)
        {
            _logger = logger;
            _userService = userService;
@@ -35,6 +39,8 @@
            _liaotianService = liaotianService;
            _pltJiatingchengyuanService = pltJiatingchengyuanService;
            _sysAttachmentService = sysAttachmentService;
            _pltRoleService = pltRoleService;
            _pltPageService = pltPageService;
        } 
 
 
@@ -52,14 +58,30 @@
            actionEntity.PageIco = "fa fa-search";
            actionEntity.ActionName = "查询";
            actionlist.Add(actionEntity);
            ActionEntity actionEntity1 = new ActionEntity();
            actionEntity1.OpenType = 0;
            actionEntity1.ActionUrl = "";
            actionEntity1.ActionFun = "Add";
            actionEntity1.PageIco = "fa fa-plus";
            actionEntity1.ActionName = "新增";
            actionlist.Add(actionEntity1);
            //ActionEntity actionEntity1 = new ActionEntity();
            //actionEntity1.OpenType = 0;
            //actionEntity1.ActionUrl = "";
            //actionEntity1.ActionFun = "Add";
            //actionEntity1.PageIco = "fa fa-plus";
            //actionEntity1.ActionName = "新增";
            //actionlist.Add(actionEntity1);
            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/User/Index/");
            var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();

            foreach (var pageEntity in pageEntities1)
            {
                ActionEntity actionEntity1 = new ActionEntity();
                actionEntity1.OpenType = pageEntity.OpenType;
                actionEntity1.ActionUrl = "";
                actionEntity1.ActionFun = pageEntity.PageShortcut;
                actionEntity1.PageIco = pageEntity.PageIco;
                actionEntity1.ActionName = pageEntity.PageName;
                actionlist.Add(actionEntity1);
            }
            ViewData["ActionInfo"] = actionlist;
            ViewData["ActionInfo2"] = pageEntities2;

            ViewBag.zhiwustatus = _liaotianService.GetSYScode("plt_user", "zhiwustatus").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
            ViewBag.post = _hrPositionService.GetList().Select(x => new { code = x.Id, label = x.PostName }).ToList();
@@ -101,7 +123,15 @@
            actionEntity1.PageIco = "fa fa-remove";
            actionEntity1.ActionName = "删除";
            actionlist.Add(actionEntity1);



            ViewData["ActionInfo"] = actionlist;

            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/User/Index/");
            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
            ViewData["ActionInfo2"] = pageEntities2;

            ViewBag.dept = _hrDeptService.GetList();//.Select(x => new { code = x.Id, label = x.DeptName }).ToList();
            ViewBag.post = _hrPositionService.GetList();//.Select(x => new { code = x.Id, label = x.PostName }).ToList();
            ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -139,9 +169,9 @@
            {
                PltUserDTO.ShebaodateName = PltUserDTO.Shebaodate.Value.ToString("yyyy-MM-dd");
            }
            if (PltUserDTO.ShiyongDate.HasValue)
            if (PltUserDTO.HetongDateEnd.HasValue)
            {
                PltUserDTO.ShiyongDateName = PltUserDTO.ShiyongDate.Value.ToString("yyyy-MM-dd");
                PltUserDTO.HetongDateEndName = PltUserDTO.HetongDateEnd.Value.ToString("yyyy-MM-dd");
            }
            if (PltUserDTO.ShiyongDate.HasValue)
            {
@@ -150,6 +180,14 @@
            if (PltUserDTO.ShiyongDate.HasValue)
            {
                PltUserDTO.ShiyongDateName = PltUserDTO.ShiyongDate.Value.ToString("yyyy-MM-dd");
            }
            if (PltUserDTO.ShiyongDate.HasValue)
            {
                PltUserDTO.ShiyongDateName = PltUserDTO.ShiyongDate.Value.ToString("yyyy-MM-dd");
            }
            if (PltUserDTO.Outdate.HasValue)
            {
                PltUserDTO.OutdateName = PltUserDTO.Outdate.Value.ToString("yyyy-MM-dd");
            }

            if (pltJiatingchengyuanDTOs.Count == 0)
@@ -255,16 +293,17 @@

            string s = @"^([A-Fa-f0-9]{2}[-,:]){5}[A-Fa-f0-9]{2}$";
            Regex rStr = new Regex(s);
            if (rStr.IsMatch(userdata.IpMac))
            {
            //if (rStr.IsMatch(userdata.IpMac))
            //{
                using (TransactionScope scope = new TransactionScope())
                {

                    bool charujues = false;
                    userdata.RecStatus = "A";
                    if (String.IsNullOrEmpty(userdata.Id))
                    {
                        userdata.Creater = curentuser.Id;
                        userdata.Createtime = DateTime.Now;
                        charujues = true;
                    }
                    userdata.Modifier = curentuser.Id;
                    userdata.Modifytime = DateTime.Now;
@@ -274,6 +313,21 @@
                    {
                        return JsonConvert.SerializeObject(resultEntity);
                    }
                    if (charujues)
                    {
                       var  pltRoleDTO = _pltRoleService.listRole().Where(x => x.RoleName == "员工").FirstOrDefault();

                        if (pltRoleDTO != null)
                        {
                            resultEntity = _pltRoleService.SaveUserRole(pltRoleDTO.Id,userdata.Id, curentuser.Id);
                            if (resultEntity.Result == false)
                            {
                                return JsonConvert.SerializeObject(resultEntity);
                            }
                        }
                       
                    }

                    string[] JiatingchengyuanId = userdata.JiatingchengyuanId;
                    string[] Name = userdata.Name;
                    string[] Guanxi = userdata.Guanxi;
@@ -332,11 +386,11 @@
                    }
                    scope.Complete();
                }
            }
            else
            {
                resultEntity.Message = "MAC地址格式错误";
            }
            //}
            //else
            //{
            //    resultEntity.Message = "MAC地址格式错误";
            //}
            return JsonConvert.SerializeObject(resultEntity);
        }
        #endregion
@@ -423,7 +477,114 @@
            ViewData.Model = dto;
            return View();
        }






        [CheckLogin]
        public IActionResult JiBenGongZi()
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            List<ActionEntity> actionlist = new List<ActionEntity>();
            ActionEntity actionEntity = new ActionEntity();
            actionEntity.OpenType = 0;
            actionEntity.ActionUrl = "";
            actionEntity.ActionFun = "Search";
            actionEntity.PageIco = "fa fa-search";
            actionEntity.ActionName = "查询";
            actionlist.Add(actionEntity);
           
            ViewData["ActionInfo"] = actionlist;
            
            ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
          
            return View();
        }

        [CheckLogin]
        public string GetUserListJiBenGongZi(PltUserDTOSearch search)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            search.Zhiwustatus = "A";
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            return JsonConvert.SerializeObject(_userService.SearchByPaging(search));
        }


        #region 修改备注
        [CheckLogin]
        public ActionResult EditBeizhu(string id = null)
        {

            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;

            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/User/JiBenGongZi");
            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
            ViewData["ActionInfo2"] = pageEntities2;
            ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();

            PltUserDTO PltUserDTO = new PltUserDTO();
            PltUserDTO.Zhiwustatus = "A";
           
            if (!String.IsNullOrEmpty(id))
            {
                PltUserDTO = _userService.GetPltUserEntity(id);
                PltUserDTO.DeptName = _hrDeptService.Get(PltUserDTO.DeptId).DeptName;

                PltUserDTO.ShiyongDateName = PltUserDTO.ShiyongDate.HasValue?PltUserDTO.ShiyongDate.Value.ToString("yyyy-MM-dd") : "";
                PltUserDTO.ShiyongDateEndName = PltUserDTO.ShiyongDateEnd.HasValue ? PltUserDTO.ShiyongDateEnd.Value.ToString("yyyy-MM-dd") : "";
            }
 
            ViewData.Model = PltUserDTO;
            return View();
        }


       


        /// <summary>
        /// 保存
        /// </summary>
        /// <param name="data">岗位实体类对象</param>
        /// <returns></returns>
        [HttpPost]
        [CheckLogin]
        public string SaveBeizhu(PltUserDTO userdata)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;


            PltUserDTO dTO = _userService.GetPltUserEntity(userdata.Id);



            dTO.ShiyongDate = userdata.ShiyongDate;
            dTO.ShiyongDateEnd = userdata.ShiyongDateEnd;
            dTO.ShiyongPrice = userdata.ShiyongPrice;
            dTO.geshuiqizheng = userdata.geshuiqizheng;
            dTO.advancewages = userdata.advancewages;
            dTO.miniyearsalary = userdata.miniyearsalary;
            dTO.senioritywages = userdata.senioritywages;
            dTO.Istravelsubsidy = userdata.Istravelsubsidy;
            dTO.BasicPrice = userdata.BasicPrice;

            dTO.Modifier = curentuser.Id;
            dTO.Modifytime = DateTime.Now;

            resultEntity = _userService.savePltUser(dTO);
            
            return JsonConvert.SerializeObject(resultEntity);
        }
        #endregion

    }
}