From e649be7905be7e74f6e09d8d74a7bd7bcd3923b7 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 16:17:35 +0800
Subject: [PATCH] 修改
---
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
index 12a155f..a6068ba 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
@@ -80,6 +80,8 @@
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.Viscustomer = Viscustomer;
ViewBag.IsYwjl = IsYwjl;
@@ -111,7 +113,29 @@
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";
+ dto.Jtype = "02";
+ //dto.Jdr = "02";
+ dto.Talk = "浠嬬粛鍏徃涓氬姟鍐呭鍜屼骇鍝併��";
+ dto.Yx = "03";
+ dto.Jy = "02";
+ dto.Zw = "02";
+
+
+
}
@@ -125,11 +149,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);
}
@@ -156,7 +199,10 @@
using (TransactionScope scope = new TransactionScope())
{
resultEntity = _intentionVisitService.save(data);
-
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
if (!string.IsNullOrEmpty(data.IsYwjl))
@@ -168,6 +214,10 @@
intentionCustomerDTO.Ywjl = curentuser.Id;
}
resultEntity = _intentionCustomerService.save(intentionCustomerDTO);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
}
else if (data.Jy == "05")
{
@@ -176,8 +226,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();
@@ -237,7 +320,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)
{
--
Gitblit v1.9.1