From 402f9568e48e6e1a9d29d37dcda46737047425d5 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 25 十一月 2021 10:49:10 +0800
Subject: [PATCH] 专家通讯录优化
---
zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 316 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
index 6818275..91cc7d4 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
@@ -30,6 +30,7 @@
private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
private readonly IIntentionCustomerService _intentionCustomerService;
private readonly IHrPositionService _hrPositionService;
+ private readonly IAdmGoodsRecordService _admGoodsRecordService;
public AdmAskController(ILogger<AdmAskController> logger, IAskService askService, IHrDeptService hrDeptService, IWfRunProcessService wfRunProcessService
, IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService
@@ -39,7 +40,8 @@
, IAdmBreakPrecedentService aAdmBreakPrecedentService
, ICooperatecustomCustomerService cooperatecustomCustomerService
, IIntentionCustomerService intentionCustomerService
- , IHrPositionService hrPositionService)
+ , IHrPositionService hrPositionService
+ , IAdmGoodsRecordService admGoodsRecordService)
{
_logger = logger;
_hrDeptService = hrDeptService;
@@ -54,6 +56,7 @@
_cooperatecustomCustomerService = cooperatecustomCustomerService;
_intentionCustomerService = intentionCustomerService;
_hrPositionService = hrPositionService;
+ _admGoodsRecordService = admGoodsRecordService;
}
public IActionResult Askcost(string id = "")
@@ -277,6 +280,19 @@
resultEntity.Message = "鐗╁搧鍓╀綑鏁伴噺涓嶈冻";
return new JsonResult(resultEntity);
}
+
+ AdmGoodsRecordDTO dto = new AdmGoodsRecordDTO();
+ dto.GoodsId = admGoodsManageDTO.Id;
+ dto.GoodsNum = admAskGoodDTO.Shuliang.Value;
+ dto.GoodsLeft = admGoodsManageDTO.GoodsLeft;
+ dto.RecordTypeId = "02";
+ dto.RecStatus = "A";
+ dto.Creater = curentuser.Id;
+ dto.Createtime = DateTime.Now;
+ dto.Modifier = curentuser.Id;
+ dto.Modifytime = DateTime.Now;
+ dto.OperationalMatters = admAskGoodDTO.Tittle;
+ resultEntity = _admGoodsRecordService.save(dto);
}
@@ -1483,6 +1499,89 @@
if (data.Step == "鎬荤粡鐞嗗鎵�")
{
//鎬荤粡鐞嗗鎵瑰悓鎰忎箣鍚庯紝鎻掑叆宸ヤ綔浜ゆ帴
+ var askCiZhiDTO = _askService.GetAskCiZhi(resultEntity.ReturnID);
+ var pltUserDTO = _userService.GetPltUserEntity(askCiZhiDTO.Creater);
+ AdmAskJiaojieDTO admAskJiaojieDTO = new AdmAskJiaojieDTO();
+ admAskJiaojieDTO.CiZhiId = resultEntity.ReturnID;
+ admAskJiaojieDTO.Remark = "";
+ admAskJiaojieDTO.ShenpiStatus = "D";
+ admAskJiaojieDTO.RecStatus = "A";
+ admAskJiaojieDTO.Creater = askCiZhiDTO.Creater;
+ admAskJiaojieDTO.Createtime = DateTime.Now;
+ admAskJiaojieDTO.Modifier = askCiZhiDTO.Creater;
+ admAskJiaojieDTO.Modifytime = admAskJiaojieDTO.Createtime;
+ admAskJiaojieDTO.CreaterName = pltUserDTO.UserName;
+ admAskJiaojieDTO.Tittle = "宸ヤ綔浜ゆ帴(" + pltUserDTO.UserName + ")";
+
+ resultEntity = _askService.SaveAskJiaojie(admAskJiaojieDTO);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ //鏌ヨ鍚堜綔瀹㈡埛
+ CooperatecustomCustomerDTOSearch searchEntity = new CooperatecustomCustomerDTOSearch();
+ searchEntity.page = 1;
+ searchEntity.rows = 10000;
+ searchEntity.Ywjl = admAskJiaojieDTO.Creater;
+ var resultDataEntity = _cooperatecustomCustomerService.SearchByPaging(searchEntity);
+ var cooperatecustomCustomerDTOs = resultDataEntity.DataList;
+ foreach (var cooperatecustomCustomerDTO in cooperatecustomCustomerDTOs)
+ {
+ AdmAskJiaojieDtlDTO admAskJiaojieDtl = new AdmAskJiaojieDtlDTO();
+ admAskJiaojieDtl.JiaojieId = admAskJiaojieDTO.Id;
+ admAskJiaojieDtl.Jiaojietime = DateTime.Now;
+ admAskJiaojieDtl.JiaojieType = "01";
+ admAskJiaojieDtl.Kehudanwei = cooperatecustomCustomerDTO.Name;
+ admAskJiaojieDtl.JiaojieStatus = "D";
+ admAskJiaojieDtl.RecStatus = "A";
+ admAskJiaojieDtl.Creater = admAskJiaojieDTO.Creater;
+ admAskJiaojieDtl.Createtime = admAskJiaojieDTO.Createtime;
+ admAskJiaojieDtl.Modifier = admAskJiaojieDTO.Creater;
+ admAskJiaojieDtl.Modifytime = admAskJiaojieDTO.Createtime;
+ resultEntity = _askService.SaveAskJiaojieDtl(admAskJiaojieDtl);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ }
+
+ //鏌ヨ鎰忓悜瀹㈡埛
+ IntentionCustomerDTOSearch searchEntityin = new IntentionCustomerDTOSearch();
+ searchEntityin.page = 1;
+ searchEntityin.rows = 10000;
+ searchEntityin.YwjlYx = admAskJiaojieDTO.Creater;
+ searchEntityin.Ywjl = admAskJiaojieDTO.Creater;
+ searchEntityin.Yixiang = "05";
+ var resultDataEntity1 = _intentionCustomerService.SearchByPaging(searchEntityin);
+ var intentionCustomerDTOs = resultDataEntity1.DataList;
+ foreach (var intentionCustomerDTO in intentionCustomerDTOs)
+ {
+ AdmAskJiaojieDtlDTO admAskJiaojieDtl = new AdmAskJiaojieDtlDTO();
+ admAskJiaojieDtl.JiaojieId = admAskJiaojieDTO.Id;
+ admAskJiaojieDtl.Jiaojietime = DateTime.Now;
+ admAskJiaojieDtl.JiaojieType = "02";
+ admAskJiaojieDtl.Kehudanwei = intentionCustomerDTO.Name;
+ admAskJiaojieDtl.JiaojieStatus = "D";
+ admAskJiaojieDtl.RecStatus = "A";
+ admAskJiaojieDtl.Creater = admAskJiaojieDTO.Creater;
+ admAskJiaojieDtl.Createtime = admAskJiaojieDTO.Createtime;
+ admAskJiaojieDtl.Modifier = admAskJiaojieDTO.Creater;
+ admAskJiaojieDtl.Modifytime = admAskJiaojieDTO.Createtime;
+ resultEntity = _askService.SaveAskJiaojieDtl(admAskJiaojieDtl);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ }
+ //鎻掑叆浜ゆ帴鏄庣粏
+
+
+
+ resultEntity = _wfRunProcessService.WfAskJiaojie(admAskJiaojieDTO.Id, "淇濆瓨", "A", admAskJiaojieDTO.Creater, "", admAskJiaojieDTO.Tittle, "v1");
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
}
@@ -1498,5 +1597,221 @@
}
return new JsonResult(resultEntity);
}
+
+
+ public IActionResult AskJiaojie(AdmAskJiaojieDTO data)
+ {
+ AdmAskJiaojieDTO dto = new AdmAskJiaojieDTO();
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+
+
+ //娴佺▼鐩稿叧
+ string shifoubiaoji = "A";
+ string sifoudangqian = "A";
+ string dangqianbuzhou = "鎻愪氦";
+ var lishiyijian = new List<WfHistoryDTO>();
+
+ if (string.IsNullOrEmpty(data.id))
+ {
+ dto.CreaterName = curentuser.UserName;
+ dto.Tittle = "宸ヤ綔浜ゆ帴锛�" + curentuser.UserName + "锛�";
+ dto.admAskJiaojieDtlDTOs = new List<AdmAskJiaojieDtlDTO>();
+ }
+ else if (dto != null)
+ {
+ dto = _askService.GetAskJiaojie(data.id);
+ dto.JiaojietimeStart = data.JiaojietimeStart;
+ dto.JiaojietimeEnd = data.JiaojietimeEnd;
+ dto.JiaojieStatus = data.JiaojieStatus;
+
+ dto.JiaojietimeStartName = dto.JiaojietimeStart.HasValue? dto.JiaojietimeStart.Value.ToString("yyyy-MM-dd"):"";
+ dto.JiaojietimeEndName = dto.JiaojietimeEnd.HasValue ? dto.JiaojietimeEnd.Value.ToString("yyyy-MM-dd") : "";
+ //dto.JineName = dto.Jine.Value.ToString("F2");
+ var admAskJiaojieDtlDTOs = _askService.GetAskJiaojieDtls(data.id);
+ if (!string.IsNullOrEmpty(data.JiaojieStatus))
+ {
+ admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs.Where(x => x.JiaojieStatus == data.JiaojieStatus).ToList();
+ }
+ if (data.JiaojietimeStart.HasValue)
+ {
+ admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs.Where(x => x.Jiaojietime >= data.JiaojietimeStart).ToList();
+ }
+ if (data.JiaojietimeEnd.HasValue)
+ {
+ admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs.Where(x => x.Jiaojietime <= data.JiaojietimeEnd.Value.AddDays(1)).ToList();
+ }
+
+ dto.admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs;
+ var wfRunProcessDTO = _wfRunProcessService.GetList(dto.Id, "22").FirstOrDefault();
+ if (wfRunProcessDTO == null)
+ {
+ shifoubiaoji = "D";
+ sifoudangqian = "D";
+ }
+ else
+ {
+ dangqianbuzhou = wfRunProcessDTO.Step;
+ //鏌ヨ瀹℃壒杩涘害
+ lishiyijian = _wfHistoryService.GetListshenpi(wfRunProcessDTO.Id);
+ if (wfRunProcessDTO.Step != "鎻愪氦")
+ {
+ shifoubiaoji = "D";
+ }
+
+ //鏌ヨ寰呭姙
+ var chaxundaiban = _wfNeeddeelService.GetListTracking(wfRunProcessDTO.Id, wfRunProcessDTO.Step).Where(x => x.DeelUserId == curentuser.Id).ToList();
+ if (chaxundaiban != null && chaxundaiban.Count > 0)
+ {
+ sifoudangqian = "A";
+ }
+ else
+ {
+ sifoudangqian = "D";
+ }
+
+ }
+
+
+
+
+ }
+
+ ViewBag.shifoubiaoji = shifoubiaoji;
+ ViewBag.sifoudangqian = sifoudangqian;
+ ViewBag.lishiyijian = lishiyijian;
+ ViewBag.dangqianbuzhou = dangqianbuzhou;
+
+ ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");
+ //ViewBag.visType = _liaotianService.GetSYScode("CooperVisit", "visType");
+ //var cooperatecustomCustomerDTOs = _cooperatecustomCustomerService.GetList();
+ //var intentionCustomerDTOs = _intentionCustomerService.GetList();
+
+ //ViewBag.CooperatecustomCustomerDTOs =
+
+ ViewData.Model = dto;
+ return View();
+ }
+
+
+ /// <summary>
+ /// 宸ヤ綔浜ゆ帴
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult SaveAskJiaojie(AdmAskJiaojieDTO data)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ResultEntity resultEntity = new ResultEntity();
+ using (TransactionScope scope = new TransactionScope())
+ {
+ if (data.Step == "鎻愪氦")
+ {
+
+ data.ShenpiStatus = "D";
+ data.RecStatus = "A";
+ data.Creater = curentuser.Id;
+ data.Createtime = DateTime.Now;
+ data.Modifier = data.Creater;
+ data.Modifytime = data.Createtime;
+
+ resultEntity = _askService.SaveAskJiaojie(data);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ //鍙戣捣娴佺▼鐩稿叧
+
+ resultEntity = _wfRunProcessService.WfAskJiaojie(data.Id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.Tittle, "v1");
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ }
+ else if (data.Step == "宸ヤ綔浜ゆ帴")
+ {
+ var ids = data.JiaojieDtlId.Split(',');
+ foreach(var id in ids)
+ {
+ if (string.IsNullOrEmpty(id))
+ {
+ continue;
+ }
+ var admAskJiaojieDtl = _askService.GetAskJiaojieDtl(id);
+ if (admAskJiaojieDtl.JiaojieStatus == "A")
+ {
+ continue;
+ }
+ else
+ {
+ admAskJiaojieDtl.JiaojieStatus = "A";
+ admAskJiaojieDtl.JiaojieUserId = curentuser.Id;
+ admAskJiaojieDtl.Jiaojietime = DateTime.Now;
+ admAskJiaojieDtl.JieShoutime = admAskJiaojieDtl.Jiaojietime;
+ admAskJiaojieDtl.Modifier = curentuser.Id; ;
+ admAskJiaojieDtl.Modifytime = admAskJiaojieDtl.Jiaojietime.Value;
+ resultEntity = _askService.SaveAskJiaojieDtl(admAskJiaojieDtl);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ }
+ }
+ var admAskJiaojieDtls = _askService.GetAskJiaojieDtls(data.Id).Where(x => x.JiaojieStatus == "D").ToList();
+ if(admAskJiaojieDtls ==null || admAskJiaojieDtls.Count == 0)
+ {
+ //鍙戣捣娴佺▼鐩稿叧
+
+ resultEntity = _wfRunProcessService.WfAskJiaojie(data.Id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.Tittle, "v1");
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ }
+ }
+
+
+
+
+ scope.Complete();
+ }
+ return new JsonResult(resultEntity);
+ }
+
+ public IActionResult EditAskJiaojie(string id)
+ {
+ ViewBag.id = id;
+ ViewBag.JiaojieType = _liaotianService.GetSYScode("ADM_AskJiaojieDtl", "JiaojieType");
+ ViewData.Model = new AdmAskJiaojieDtlDTO();
+ return View();
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ [HttpPost]
+
+ public string SaveAskJiaojieDtl(AdmAskJiaojieDtlDTO data)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ data.RecStatus = "A";
+ data.JiaojieStatus = "D";
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Creater = curentuser.Id;
+ data.Createtime = DateTime.Now;
+ }
+ data.Modifier = curentuser.Id;
+ data.Modifytime = DateTime.Now;
+
+ ResultEntity resultEntity = _askService.SaveAskJiaojieDtl(data);
+
+ return JsonConvert.SerializeObject(resultEntity);
+ }
+
}
}
--
Gitblit v1.9.1