From 072169e3c5446f94e2cf4e570e5c7952bb5b15b9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 14:47:44 +0800
Subject: [PATCH] 今日开发 考勤规则里增加 公司安排加班 调整请假时间计算 加班日考勤计算
---
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 14 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index 95b6936..9393781 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -30,9 +30,11 @@
private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
private readonly IMapper _mapper;
private readonly IHrDeptService _hrDeptService;
+ private readonly IPltPageService _pltPageService;
- public IntentionCustomerController(ILogger<IntentionCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, IIntentionCustomerService intentionCustomerService, IUserService userService, ICooperatecustomCustomerService cooperatecustomCustomerService, IMapper mapper, IHrDeptService hrDeptService)
+ public IntentionCustomerController(ILogger<IntentionCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, IIntentionCustomerService intentionCustomerService, IUserService userService
+ , ICooperatecustomCustomerService cooperatecustomCustomerService, IMapper mapper, IHrDeptService hrDeptService, IPltPageService pltPageService)
{
_logger = logger;
_projectService = projectService;
@@ -42,6 +44,7 @@
_cooperatecustomCustomerService = cooperatecustomCustomerService;
_mapper = mapper;
_hrDeptService = hrDeptService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -121,7 +124,7 @@
ViewBag.Creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
-
+ ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.ShengDropDown = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
@@ -141,18 +144,28 @@
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);
+
+
+
+ List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/IndexYiXiang/");
+ foreach(var pageEntity in pageEntities)
+ {
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = pageEntity.OpenType;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = pageEntity.PageShortcut;
+ actionEntity.PageIco = pageEntity.PageIco;
+ actionEntity.ActionName = pageEntity.PageName;
+ actionlist.Add(actionEntity);
+ }
+
ViewData["ActionInfo"] = actionlist;
+
+
ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.ywjl = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
@@ -168,6 +181,38 @@
//ViewBag.ShengDropDown = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
return View();
+ }
+
+ /// <summary>
+ /// 瑙ｇ粦
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public JsonResult UnBind(string id)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ResultEntity resultEntity = new ResultEntity();
+ using (TransactionScope scope = new TransactionScope())
+ {
+ string[] ids = id.Split(',');
+ foreach (var iddd in ids)
+ {
+ var intentionCustomerDTO = _intentionCustomerService.Get(iddd);
+ intentionCustomerDTO.Yixiang = null;
+ intentionCustomerDTO.Yixiangtime = null;
+ resultEntity = _intentionCustomerService.save(intentionCustomerDTO);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ }
+
+
+
+ scope.Complete();
+ }
+ return new JsonResult(resultEntity);
}
public IActionResult Edit(string id = null,string namecus = null)
@@ -258,6 +303,30 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
data.RecStatus = "A";
+ if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
+ {
+ data.Shifoutianjiaweixin = "D";
+ data.Weixiner = null;
+ data.Weixintime = null;
+ }
+ else
+ {
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Weixiner = curentuser.Id;
+ data.Weixintime = DateTime.Now;
+ }
+ else
+ {
+ var cooperatecustomCustomerDTO = _intentionCustomerService.Get(data.Id);
+ if (string.IsNullOrEmpty(cooperatecustomCustomerDTO.Weixiner))
+ {
+ data.Weixiner = curentuser.Id;
+ data.Weixintime = DateTime.Now;
+ }
+
+ }
+ }
if (String.IsNullOrEmpty(data.Id))
{
data.Creater = curentuser.Id;
@@ -317,11 +386,11 @@
for (int i = 0; i < result.Count; i++)
{
- //resultEntity = _intentionCustomerService.ModifyStatus(result[i].Id, curentuser.Id);
- //if (!resultEntity.Result)
- //{
- // return new JsonResult(resultEntity);
- //}
+ resultEntity = _intentionCustomerService.ModifyStatus(result[i].Id, curentuser.Id);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
var dto = _mapper.Map<CooperatecustomCustomerDTO>(result[i]);
dto.Id = "";
--
Gitblit v1.9.1