zhengcaioa.git - Gitblit

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


			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)
			{
			_logger = logger;
			_userService = userService;
			@@ -35,6 +37,7 @@
			_liaotianService = liaotianService;
			_pltJiatingchengyuanService = pltJiatingchengyuanService;
			_sysAttachmentService = sysAttachmentService;
			_pltRoleService = pltRoleService;
			}


			@@ -151,6 +154,10 @@
			{
			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 +262,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 +282,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 +355,11 @@
			}
			scope.Complete();
			}
			}
			else
			{
			resultEntity.Message = "MAC地址格式错误";
			}
			//}
			//else
			//{
			// resultEntity.Message = "MAC地址格式错误";
			//}
			return JsonConvert.SerializeObject(resultEntity);
			}
			#endregion
			@@ -423,7 +446,102 @@
			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();
			}


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

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


			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

			}
			}