From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 103 insertions(+), 11 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
index 184d084..521e71a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
@@ -8,6 +8,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using System.Transactions;
using zhengcaioa.IService;
using zhengcaioa.Models;
@@ -20,15 +21,17 @@
private readonly IHrJibengongziService _hrJibengongziService;
private readonly ILiaotianService _liaotianService;
private readonly IHrPositionService _hrPositionService;
+ private readonly IPltPageService _pltPageService;
-
- public HrJibengongziController(ILogger<HrJibengongziController> logger, IHrJibengongziService hrJibengongziService, ILiaotianService liaotianService, IHrPositionService hrPositionService)
+ public HrJibengongziController(ILogger<HrJibengongziController> logger, IHrJibengongziService hrJibengongziService, ILiaotianService liaotianService, IHrPositionService hrPositionService
+ , IPltPageService pltPageService)
{
_logger = logger;
_hrJibengongziService = hrJibengongziService;
_liaotianService = liaotianService;
_hrPositionService = hrPositionService;
+ _pltPageService = pltPageService;
}
@@ -44,13 +47,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, "/HrJibengongzi/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();
@@ -76,7 +92,9 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/HrJibengongzi/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
HrJibengongziDTO dto = new HrJibengongziDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -90,7 +108,7 @@
dto.QuanqingjiangName = dto.Quanqingjiang.HasValue ? dto.Quanqingjiang.Value.ToString("F2") : "";
dto.JiaotongbutieName = dto.Jiaotongbutie.HasValue ? dto.Jiaotongbutie.Value.ToString("F2") : "";
dto.EffecttimeName = dto.Effecttime.HasValue ? dto.Effecttime.Value.ToString("yyyy-MM-dd") : DateTime.Now.ToString("yyyy-MM-dd");
-
+ dto.JiabangongziName = dto.Jiabangongzi.HasValue ? dto.Jiabangongzi.Value.ToString("F2") : "";
@@ -153,5 +171,79 @@
ViewData["curentuser"] = curentuser;
return new JsonResult(_hrJibengongziService.ModifyStatus(Id, curentuser.Id));
}
+
+
+ public IActionResult EditShebao()
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var shebaoDTO = _hrJibengongziService.GetListShebao().FirstOrDefault();
+
+
+ if (shebaoDTO == null)
+ {
+ shebaoDTO = new HrShebaoDTO();
+ shebaoDTO.Shebaodanwei = 0;
+ shebaoDTO.Shebaogeren = 0;
+ }
+
+
+
+
+ ViewData.Model = shebaoDTO;
+
+
+
+
+ return View();
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+ [HttpPost]
+ public IActionResult SaveShebao(HrShebaoDTO data)
+ {
+
+ ResultEntity resultEntity = new ResultEntity();
+
+
+
+ using (TransactionScope scope = new TransactionScope())
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ data.RecStatus = "A";
+
+ var resultDTO = _hrJibengongziService.GetListShebao().FirstOrDefault();
+ if (resultDTO == null || string.IsNullOrEmpty(resultDTO.Id))
+ {
+ resultDTO = new HrShebaoDTO();
+ resultDTO.Shebaodanwei = data.Shebaodanwei;
+ resultDTO.Shebaogeren = data.Shebaogeren;
+ resultDTO.Creater = curentuser.Id;
+ resultDTO.Createtime = DateTime.Now;
+ }
+ else
+ {
+ resultDTO.Shebaodanwei = data.Shebaodanwei;
+ resultDTO.Shebaogeren = data.Shebaogeren;
+ }
+ resultDTO.Modifier = curentuser.Id;
+ resultDTO.Modifytime = DateTime.Now;
+
+ resultEntity = _hrJibengongziService.saveShebao(resultDTO);
+
+ scope.Complete();
+ }
+
+
+ return new JsonResult(resultEntity);
+ }
+
}
}
--
Gitblit v1.9.1