From 45c0e976bd0864dbf103717b45d68a6e0419f456 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期日, 27 六月 2021 13:09:34 +0800
Subject: [PATCH] 工资核对状态逻辑修改，3天自动确认；物品添加默认启用；
---
zhengcaioa/zhengcaioa/Controllers/UserController.cs | 95 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 95 insertions(+), 0 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/UserController.cs b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
index 867184c..be27733 100644
--- a/zhengcaioa/zhengcaioa/Controllers/UserController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
@@ -423,7 +423,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
}
}
--
Gitblit v1.9.1