From d67cb0c9792e23be7ccf655675cb32ac1a236b7b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 十一月 2022 09:49:22 +0800
Subject: [PATCH] 在人事管理页面增加查看员工考勤记录功能
---
zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs | 143 ++++++++++++++++++++++++++++++++---------------
1 files changed, 96 insertions(+), 47 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
index 46d9b4d..abc77a8 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
@@ -29,10 +29,13 @@
private readonly IUserService _userService;
private readonly IHrDeptService _hrDeptService;
private readonly ISysAttachmentService _sysAttachmentService;
-
+ private readonly IPltPageService _pltPageService;
+ private readonly ICooperVisitService _cooperVisitService;
public CooperatecustomCustomerController(ILogger<CooperatecustomCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, ICooperatecustomCustomerService cooperatecustomCustomerService, IUserService userService, IHrDeptService hrDeptService
- , ISysAttachmentService sysAttachmentService)
+ , ISysAttachmentService sysAttachmentService
+ , IPltPageService pltPageService
+ , ICooperVisitService cooperVisitService)
{
_logger = logger;
_projectService = projectService;
@@ -41,6 +44,8 @@
_userService = userService;
_hrDeptService = hrDeptService;
_sysAttachmentService = sysAttachmentService;
+ _pltPageService = pltPageService;
+ _cooperVisitService = cooperVisitService;
}
public IActionResult Index()
@@ -48,58 +53,85 @@
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);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Search";
+ //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 actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Print";
- actionEntity3.PageIco = "fa fa-print";
- actionEntity3.ActionName = "鎵撳嵃璧勬枡";
- actionlist.Add(actionEntity3);
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Print";
+ //actionEntity3.PageIco = "fa fa-print";
+ //actionEntity3.ActionName = "鎵撳嵃璧勬枡";
+ //actionlist.Add(actionEntity3);
- ActionEntity actionEntity4 = new ActionEntity();
- actionEntity4.OpenType = 0;
- actionEntity4.ActionUrl = "";
- actionEntity4.ActionFun = "Duanxin";
- actionEntity4.PageIco = "";
- actionEntity4.ActionName = "缇ゅ彂鐭俊";
- actionlist.Add(actionEntity4);
+ //ActionEntity actionEntity4 = new ActionEntity();
+ //actionEntity4.OpenType = 0;
+ //actionEntity4.ActionUrl = "";
+ //actionEntity4.ActionFun = "Duanxin";
+ //actionEntity4.PageIco = "";
+ //actionEntity4.ActionName = "缇ゅ彂鐭俊";
+ //actionlist.Add(actionEntity4);
- ActionEntity actionEntity5 = new ActionEntity();
- actionEntity5.OpenType = 0;
- actionEntity5.ActionUrl = "";
- actionEntity5.ActionFun = "Youjian";
- actionEntity5.PageIco = "";
- actionEntity5.ActionName = "缇ゅ彂閭欢";
- actionlist.Add(actionEntity5);
+ //ActionEntity actionEntity5 = new ActionEntity();
+ //actionEntity5.OpenType = 0;
+ //actionEntity5.ActionUrl = "";
+ //actionEntity5.ActionFun = "Youjian";
+ //actionEntity5.PageIco = "";
+ //actionEntity5.ActionName = "缇ゅ彂閭欢";
+ //actionlist.Add(actionEntity5);
- ActionEntity actionEntity6 = new ActionEntity();
- actionEntity6.OpenType = 0;
- actionEntity6.ActionUrl = "";
- actionEntity6.ActionFun = "Xinhan";
- actionEntity6.PageIco = "";
- actionEntity6.ActionName = "鍟嗕笟淇″嚱";
- actionlist.Add(actionEntity6);
+ //ActionEntity actionEntity6 = new ActionEntity();
+ //actionEntity6.OpenType = 0;
+ //actionEntity6.ActionUrl = "";
+ //actionEntity6.ActionFun = "Xinhan";
+ //actionEntity6.PageIco = "";
+ //actionEntity6.ActionName = "鍟嗕笟淇″嚱";
+ //actionlist.Add(actionEntity6);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperatecustomCustomer/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
+ {
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+ ViewData["Creater"] = curentuser.Id;
+ }
+ 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.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.khly = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -125,6 +157,12 @@
areaDTOsic.ParentId = "0 ";
areaDTOs.Insert(1, areaDTOsic);
ViewBag.ShengDropDown = areaDTOs.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
+
+
+ ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+
+
return View();
}
@@ -139,12 +177,21 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperatecustomCustomer/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
CooperatecustomCustomerDTO cooperatecustomCustomerDTO = new CooperatecustomCustomerDTO();
if (!String.IsNullOrEmpty(id))
{
cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(id);
+
+ CooperVisitDTOSearch searchEntity = new CooperVisitDTOSearch();
+ searchEntity.page = 1;
+ searchEntity.rows = 1000;
+ searchEntity.Viscustomer = id;
+ var resultDataEntity = _cooperVisitService.SearchByPaging(searchEntity);
+ ViewData["visitlishi"] = resultDataEntity.DataList;
}
else
{
@@ -153,7 +200,9 @@
cooperatecustomCustomerDTO.Sheng = "510000";
cooperatecustomCustomerDTO.City = "510100";
cooperatecustomCustomerDTO.AreaId = "510107";
-
+
+ ViewData["visitlishi"] = new List<CooperVisitDTO>();
+
}
var areaDTOs = _projectService.Getsheng().ToList();
--
Gitblit v1.9.1