From d66cbfe2dec69d08f9905b320851eb11d09567bc Mon Sep 17 00:00:00 2001
From: PC-201906131823\Administrator <zyyao>
Date: 星期三, 10 十一月 2021 16:14:55 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 86 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
index bfab3a8..2f60ab4 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,15 +121,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.Jdr = "02";
dto.Talk = "浠嬬粛鍏徃涓氬姟鍐呭鍜屼骇鍝併��";
dto.Yx = "03";
dto.Jy = "02";
-
+ dto.Zw = "02";
+
+
+
}
@@ -135,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);
}
@@ -166,7 +207,10 @@
using (TransactionScope scope = new TransactionScope())
{
resultEntity = _intentionVisitService.save(data);
-
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
if (!string.IsNullOrEmpty(data.IsYwjl))
@@ -178,6 +222,10 @@
intentionCustomerDTO.Ywjl = curentuser.Id;
}
resultEntity = _intentionCustomerService.save(intentionCustomerDTO);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
}
else if (data.Jy == "05")
{
@@ -186,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();
@@ -247,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)
{
@@ -261,7 +342,7 @@
resultEntity.Message = "鏃犺仈绯讳汉";
}
- string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong);
+ string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong+ " 閫�璁㈠洖N");
if (int.Parse(sss) <= 0)
{
resultEntity.Result = false;
--
Gitblit v1.9.1