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/Customer/IntentionVisitController.cs | 84 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 3 deletions(-) diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs index ebb16bc..de561dc 100644 --- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs +++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs @@ -106,6 +106,14 @@ { dto = _intentionVisitService.Get(id); + //dto.Viscustomer = Viscustomer; + IntentionVisitDTOSearch searchEntity = new IntentionVisitDTOSearch(); + searchEntity.page = 1; + searchEntity.rows = 1000; + searchEntity.Viscustomer = dto.Viscustomer; + var resultDataEntity = _intentionVisitService.SearchByPaging(searchEntity); + ViewData["visitlishi"] = resultDataEntity.DataList; + } else { @@ -113,6 +121,17 @@ if (!string.IsNullOrWhiteSpace(Viscustomer)) { dto.Viscustomer = Viscustomer; + IntentionVisitDTOSearch searchEntity = new IntentionVisitDTOSearch(); + searchEntity.page = 1; + searchEntity.rows = 1000; + searchEntity.Viscustomer = Viscustomer; + var resultDataEntity = _intentionVisitService.SearchByPaging(searchEntity); + ViewData["visitlishi"] = resultDataEntity.DataList; + + } + else + { + ViewData["visitlishi"] = new List<IntentionVisitDTO>(); } dto.VisType = "01"; @@ -138,11 +157,30 @@ ViewData["yx"] = _liaotianService.GetSYScode("CooperVisit", "yx"); ViewData["jy"] = _liaotianService.GetSYScode("CooperVisit", "jy"); + ViewData["Duanxin"] = _intentionVisitService.GetListDuanxin(); ViewBag.IsYwjl = IsYwjl; ViewData.Model = dto; return View(); + } + + + public IActionResult getDuanxin(string id) + { + ResultEntity resultEntity = new ResultEntity(); + resultEntity.Result = true; + var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User")); + ViewData["curentuser"] = curentuser; + + var intentionVisitDuanxinDTO = _intentionVisitService.GetDuanxin(id); + if(intentionVisitDuanxinDTO!=null && !string.IsNullOrEmpty(intentionVisitDuanxinDTO.DuanxinNeirong)) + { + resultEntity.Message = string.Format(intentionVisitDuanxinDTO.DuanxinNeirong, curentuser.UserName, curentuser.Phone); + } + + + return new JsonResult(resultEntity); } @@ -169,7 +207,10 @@ using (TransactionScope scope = new TransactionScope()) { resultEntity = _intentionVisitService.save(data); - + if (!resultEntity.Result) + { + return new JsonResult(resultEntity); + } if (!string.IsNullOrEmpty(data.IsYwjl)) @@ -181,6 +222,10 @@ intentionCustomerDTO.Ywjl = curentuser.Id; } resultEntity = _intentionCustomerService.save(intentionCustomerDTO); + if (!resultEntity.Result) + { + return new JsonResult(resultEntity); + } } else if (data.Jy == "05") { @@ -189,8 +234,41 @@ intentionCustomerDTO.Yixiangtime = data.Vistime; intentionCustomerDTO.Dianxiaozhuanyuan = curentuser.Id; resultEntity = _intentionCustomerService.save(intentionCustomerDTO); + if (!resultEntity.Result) + { + return new JsonResult(resultEntity); + } } + + + if (!string.IsNullOrEmpty(data.DuanxinNeirong)) + { + IntentionCustomerDTO intentionCustomerDTO = _intentionCustomerService.Get(data.Viscustomer); + if(intentionCustomerDTO!=null && ( !string.IsNullOrEmpty(intentionCustomerDTO.Phone) || !string.IsNullOrEmpty(intentionCustomerDTO.Tel))) + { + string sss = SMSHelper.PushWToUserMES(string.IsNullOrEmpty(intentionCustomerDTO.Phone)? intentionCustomerDTO.Tel: intentionCustomerDTO.Phone, "鎮ㄥソ锛屽鎴�. 璇︽儏瑙侊細"+data.DuanxinNeirong); + if (int.Parse(sss) <= 0) + { + resultEntity.Result = false; + resultEntity.Message = "鐭俊鍙戦�佸け璐�"; + + } + if (!resultEntity.Result) + { + return new JsonResult(resultEntity); + } + } + else + { + resultEntity.Result = false; + resultEntity.Message = "瀹㈡埛鏃犳墜鏈哄彿鐮�"; + return new JsonResult(resultEntity); + } + + + } + scope.Complete(); @@ -250,7 +328,7 @@ { for(int i=0;i< result.Count; i++) { - number.Append(result[i].Phone); + number.Append(string.IsNullOrEmpty(result[i].Phone)? result[i].Tel: result[i].Phone); customename += result[i].Name + ","; if (i!= result.Count - 1) { @@ -264,7 +342,7 @@ resultEntity.Message = "鏃犺仈绯讳汉"; } - string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong); + string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛屽鎴�. 璇︽儏瑙侊細" + neirong ); if (int.Parse(sss) <= 0) { resultEntity.Result = false; -- Gitblit v1.9.1