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 | 193 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 170 insertions(+), 23 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index 1c317d5..9393781 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -15,6 +15,7 @@
using System.Threading.Tasks;
using zhengcaioa.Models;
using zhengcaioa.IService;
+using System.Transactions;
namespace zhengcaioa.Controllers.Customer
{
@@ -29,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;
@@ -41,6 +44,7 @@
_cooperatecustomCustomerService = cooperatecustomCustomerService;
_mapper = mapper;
_hrDeptService = hrDeptService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -113,14 +117,14 @@
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();
+ ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
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();
@@ -132,6 +136,83 @@
{
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_intentionCustomerService.SearchByPaging(search));
+ }
+
+
+ public IActionResult IndexYiXiang()
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<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();
+
+ ViewBag.Dianxiaozhuanyuan = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
+
+
+ ViewBag.ywjlId = curentuser.Id;
+
+ //ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+ //ViewBag.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ //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)
@@ -162,7 +243,7 @@
var users = _userService.GetList().Where(x => x.IsYwjl == "A").ToList(); ;
ViewData["khlx"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx");
- ViewData["khly"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly");
+ ViewData["khly"] = _liaotianService.GetSYScode("IntentionCustomer", "khly");
ViewData["hyfl"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl");
ViewData["users"] = users;
@@ -174,6 +255,40 @@
ViewData.Model = intentionCustomerDTO;
return View();
}
+
+
+
+
+ public IActionResult EditByName( string name)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+ IntentionCustomerDTO intentionCustomerDTO = new IntentionCustomerDTO();
+
+ intentionCustomerDTO = _intentionCustomerService.GetByName(name);
+
+
+
+ var sheng = _projectService.Getsheng();
+ var shi = _projectService.Getshi(intentionCustomerDTO.Sheng);
+ var quxian = _projectService.Getquxian(intentionCustomerDTO.City);
+ var users = _userService.GetList().Where(x => x.IsYwjl == "A").ToList(); ;
+
+ ViewData["khlx"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx");
+ ViewData["khly"] = _liaotianService.GetSYScode("IntentionCustomer", "khly");
+ ViewData["hyfl"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl");
+
+ ViewData["users"] = users;
+
+ ViewData["sheng"] = sheng;
+ ViewData["shi"] = shi;
+ ViewData["quxian"] = quxian;
+ ViewData["DeptId"] = _hrDeptService.GetList();
+ ViewData.Model = intentionCustomerDTO;
+ return View();
+ }
+
/// <summary>
@@ -188,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;
@@ -240,31 +379,39 @@
resultEntity.Result = false;
resultEntity.Message = "娌℃湁鎵惧埌瀹㈡埛!";
}
-
-
- if (result != null && result.Count > 0)
+ using(TransactionScope scope = new TransactionScope())
{
- for (int i = 0; i < result.Count; i++)
+ if (result != null && result.Count > 0)
{
- var dto = _mapper.Map<CooperatecustomCustomerDTO>(result[i]);
- dto.Id = "";
- dto.Creater = curentuser.Id;
- dto.Modifier = curentuser.Id;
- dto.Createtime = DateTime.Now;
- dto.Modifytime = dto.Createtime;
- dto.zhuanyi = true;
- resultEntity = _cooperatecustomCustomerService.save(dto);
- if (!resultEntity.Result)
+ for (int i = 0; i < result.Count; i++)
{
- 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 = "";
+ dto.Creater = curentuser.Id;
+ dto.Modifier = curentuser.Id;
+ dto.Createtime = DateTime.Now;
+ dto.Modifytime = dto.Createtime;
+ dto.zhuanyi = true;
+ resultEntity = _cooperatecustomCustomerService.save(dto);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
}
}
+
+
+ scope.Complete();
}
- else
- {
- resultEntity.Result = false;
- resultEntity.Message = "鏃犺仈绯讳汉鍙风爜";
- }
+
+
--
Gitblit v1.9.1