From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs
index 2aecacb..4f42068 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs
@@ -21,21 +21,23 @@
private readonly ILiaotianService _liaotianService;
private readonly IHrPositionService _hrPositionService;
private readonly IFiPiecerateService _fiPiecerateService;
-
+ private readonly IPltPageService _pltPageService;
public HrJixiaotichengController(ILogger<HrJixiaotichengController> logger, IHrJixiaotichengService hrJixiaotichengService, ILiaotianService liaotianService, IHrPositionService hrPositionService
- , IFiPiecerateService fiPiecerateService)
+ , IFiPiecerateService fiPiecerateService
+ , IPltPageService pltPageService)
{
_logger = logger;
_hrJixiaotichengService = hrJixiaotichengService;
_liaotianService = liaotianService;
_hrPositionService = hrPositionService;
_fiPiecerateService = fiPiecerateService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
- {
+ {
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
@@ -46,13 +48,26 @@
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, "/HrJixiaoticheng/Index");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").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;
ViewBag.post = _hrPositionService.GetList().Select(x => new { code = x.Id, label = x.PostName }).ToList();
@@ -79,7 +94,9 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/HrJixiaoticheng/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
HrJixiaotichengDTO dto = new HrJixiaotichengDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -124,6 +141,19 @@
public IActionResult Save(HrJixiaotichengDTO data)
{
+ ResultEntity resultEntity = new ResultEntity();
+ if ( (data.Renwustandard == "01" || data.Renwustandard == "02") && data.Tichengstandard != "01")
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "浠诲姟鏍囧噯锛堜釜锛夊彧鑳藉搴旀彁鎴愭爣鍑嗭紙瀹氶锛夛紒";
+ return new JsonResult(resultEntity);
+ }
+ if ((data.Renwustandard == "03" || data.Renwustandard == "04") && data.Tichengstandard != "02")
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "浠诲姟鏍囧噯锛堝厓锛夊彧鑳藉搴旀彁鎴愭爣鍑嗭紙娴姩锛夛紒";
+ return new JsonResult(resultEntity);
+ }
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
data.RecStatus = "A";
@@ -135,7 +165,7 @@
data.Modifier = curentuser.Id;
data.Modifytime = DateTime.Now;
- ResultEntity resultEntity = _hrJixiaotichengService.save(data);
+ resultEntity = _hrJixiaotichengService.save(data);
return new JsonResult(resultEntity);
}
--
Gitblit v1.9.1