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/AdmManagement/DailyManagementController.cs | 215 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 191 insertions(+), 24 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs
index 7753309..8cd8eb6 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs
@@ -10,6 +10,7 @@
using DTO;
using Microsoft.AspNetCore.Http;
using zhengcaioa.IService;
+using CommonToolsCore;
namespace zhengcaioa.Controllers.AdmManagement
{
@@ -20,38 +21,64 @@
private readonly ILiaotianService _liaotianService;
private readonly IUserService _userService;
private readonly IHrDeptService _hrDeptService;
+ private readonly IPltPageService _pltPageService;
[CheckLogin]
public DailyManagementController(ILogger<DailyManagementController> logger, IDailyManagementService DailyManageService,
- ILiaotianService liaotianService, IUserService userService, IHrDeptService hrDeptService)
+ ILiaotianService liaotianService, IUserService userService, IHrDeptService hrDeptService
+ , IPltPageService pltPageService)
{
_logger = logger;
_DailyManageService = DailyManageService;
_liaotianService = liaotianService;
_userService = userService;
_hrDeptService = hrDeptService;
+ _pltPageService = pltPageService;
}
#region 閫氳瘽绠＄悊
[CheckLogin]
public IActionResult HoldPhone()
{
+ 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 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, "/DailyManagement/HoldPhone/");
+ 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.LineType = _liaotianService.GetSYScode("ADM_HoldPhone", "LineType").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.Intention = _liaotianService.GetSYScode("ADM_HoldPhone", "Intention").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
return View();
@@ -189,7 +216,7 @@
AdmMemoBookDTO admMemoBookDTO = _DailyManageService.GetMemoBook(id);
if (!admMemoBookDTO.Time.HasValue)
{
- admMemoBookDTO.TimeName = "";
+ admMemoBookDTO.TimeName = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
Rtype = string.IsNullOrEmpty(admMemoBookDTO.Rtype)? Rtype : admMemoBookDTO.Rtype;
}
else
@@ -279,13 +306,32 @@
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, "/DailyManagement/MemoWorkAnPai");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+
+ 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;
+
//ActionEntity actionEntity2 = new ActionEntity();
//actionEntity2.OpenType = 0;
@@ -298,7 +344,7 @@
ViewBag.User = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
ViewBag.Wancheng = _liaotianService.GetSYScode("ADM_MemoBook", "HaveRead").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
- ViewData["ActionInfo"] = actionlist;
+ //ViewData["ActionInfo"] = actionlist;
return View();
}
@@ -693,5 +739,126 @@
}
#endregion
+
+
+
+
+ //鍙戦�侀獙璇佺爜
+
+
+ public IActionResult PushYanZhengMa(String Phone)
+ {
+ ReturnMsg<AdmPhoneMessageDTO> returnMsg = new ReturnMsg<AdmPhoneMessageDTO>();
+ returnMsg.code = 2;
+ try
+ {
+ Random rd = new Random();
+ int end = 999999;
+
+ int begin = 100000;
+
+ int xxxx = rd.Next(begin, end);
+
+ string sss = SMSHelper.PushWToUserMESYanZhengMa(Phone, xxxx.ToString());
+ if (int.Parse(sss) <= 0)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "鐭俊鍙戦�佸け璐�";
+ returnMsg.returnObj = null;
+ return new JsonResult(returnMsg);
+ }
+
+ AdmPhoneMessageDTO admPhoneMessageDTO = new AdmPhoneMessageDTO();
+ admPhoneMessageDTO.Phone = Phone;
+ admPhoneMessageDTO.Createtime = DateTime.Now;
+ admPhoneMessageDTO.Message = xxxx.ToString();
+ ResultEntity rs = _DailyManageService.SavePhoneMessage(admPhoneMessageDTO);
+ if (!rs.Result)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "鐭俊鍙戦�佸け璐�";
+ returnMsg.returnObj = null;
+ return new JsonResult(returnMsg);
+ }
+
+ returnMsg.code = 1;
+ returnMsg.count = 0;
+ returnMsg.returnObj = admPhoneMessageDTO;
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+
+ }
+
+
+ //淇濆瓨閫氳瘽璁板綍
+
+ [HttpPost]
+ public IActionResult SaveHoldPhone([FromBody]AdmHoldPhoneDTO admHoldPhone)
+ {
+ ReturnMsg<AdmHoldPhoneDTO> returnMsg = new ReturnMsg<AdmHoldPhoneDTO>();
+ returnMsg.code = 2;
+ try
+ {
+
+ //鍒ゆ柇楠岃瘉鐮佹槸鍚︽纭�
+ var phoneMessageDTO = _DailyManageService.GetPhoneMessageZuijin(admHoldPhone.Phone);
+ //double minu = (DateTime.Now - phoneMessageDTO.Createtime).TotalMinutes;
+ if (phoneMessageDTO==null|| string.IsNullOrEmpty(phoneMessageDTO.Message))
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "楠岃瘉鐮侀敊璇�";
+ returnMsg.returnObj = null;
+ return new JsonResult(returnMsg);
+ }
+ else if (phoneMessageDTO.Message != admHoldPhone.Message)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "楠岃瘉鐮侀敊璇�";
+ returnMsg.returnObj = null;
+ return new JsonResult(returnMsg);
+ }else if ((DateTime.Now - phoneMessageDTO.Createtime).TotalMinutes>5 )
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "楠岃瘉鐮佽秴杩�5鍒嗛挓锛岄獙璇佺爜澶辨晥";
+ returnMsg.returnObj = null;
+ return new JsonResult(returnMsg);
+ }
+
+
+
+ admHoldPhone.RecStatus = "A";
+ admHoldPhone.InTime = DateTime.Now;
+ admHoldPhone.LineType = "1";
+ admHoldPhone.Intention = "3";
+ admHoldPhone.Creater = "e4c93811-b9b1-4998-89f5-c416ebab0c07";
+ admHoldPhone.Createtime = DateTime.Now;
+ admHoldPhone.Modifier = "e4c93811-b9b1-4998-89f5-c416ebab0c07";
+ admHoldPhone.Modifytime = DateTime.Now;
+ admHoldPhone.UserId = "e4c93811-b9b1-4998-89f5-c416ebab0c07";
+ admHoldPhone.Handling = null;
+
+ admHoldPhone.Id = null;
+ ResultEntity resultEntity = _DailyManageService.SaveHoldPhone(admHoldPhone);
+ returnMsg.code = 1;
+ returnMsg.count = 0;
+ returnMsg.returnObj = admHoldPhone;
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+
+ }
}
}
--
Gitblit v1.9.1