From 1aa53fde5eb18a39c53daf910d69cb857913b08d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 06 七月 2022 15:23:02 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 101 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 92 insertions(+), 9 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index 75196cb..9dfdbf6 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -141,7 +141,21 @@
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();
+ var areaDTOs = _projectService.Getsheng().ToList();
+ foreach (var areaDTO in areaDTOs)
+ {
+ if (areaDTO.CodeId == "510000")
+ {
+ areaDTOs.Remove(areaDTO);
+ break;
+ }
+ }
+ var areaDTOsic = new Area();
+ areaDTOsic.CodeId = "510000";
+ areaDTOsic.Name = "鍥涘窛鐪�";
+ areaDTOsic.ParentId = "0 ";
+ areaDTOs.Insert(1, areaDTOsic);
+ ViewBag.ShengDropDown = areaDTOs.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
return View();
}
@@ -174,7 +188,11 @@
int y = 1;
var columnTitles = new List<string>()
{
- /*"寤烘。鏃堕棿",*/"瀹㈡埛鍗曚綅","璇︾粏鍦板潃","鑱旂郴鐢佃瘽","鐢靛瓙閭","瀹㈡埛寰俊"
+ "寤烘。鏃堕棿","瀹㈡埛鏉ユ簮","琛屼笟鍒嗙被","瀹㈡埛绫诲瀷","瀹㈡埛鍚嶇О","瀹㈡埛鍗曚綅","鑱旂郴浜哄井淇�"
+ ,"瀹㈡埛鍦板潃","缃戝潃","鑱旂郴浜哄骇鏈�","鑱旂郴浜烘墜鏈�","鑱旂郴浜篞Q","鑱旂郴浜洪偖绠�",
+
+ "鑱旂郴浜�2濮撳悕","鑱旂郴浜�2鎵嬫満","鑱旂郴浜�2QQ"
+
};
foreach(var columnTitle in columnTitles)
{
@@ -190,17 +208,39 @@
x++;
y = 1;
var cell = worksheet.Cells[x, y++];
- //cell.Value = item.CreatetimeName;
- //cell = worksheet.Cells[x, y++];
+ cell.Value = item.CreatetimeName;
+
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.KhlyName;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.HyflName;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.KhlxName;
+ cell = worksheet.Cells[x, y++];
cell.Value = item.Name;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Name;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Weixin;
cell = worksheet.Cells[x, y++];
cell.Value = item.Address;
cell = worksheet.Cells[x, y++];
+ cell.Value = item.Url;
+ cell = worksheet.Cells[x, y++];
cell.Value = item.Tel;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Phone;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Qq;
cell = worksheet.Cells[x, y++];
cell.Value = item.Email;
cell = worksheet.Cells[x, y++];
- cell.Value = item.Weixin;
+ cell.Value = item.YwName;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.YwTel;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.YwQq;
+
}
@@ -247,6 +287,14 @@
actionlist.Add(actionEntity);
}
+ ActionEntity actionEntity4 = new ActionEntity();
+ actionEntity4.OpenType = 0;
+ actionEntity4.ActionUrl = "";
+ actionEntity4.ActionFun = "Duanxin";
+ actionEntity4.PageIco = "";
+ actionEntity4.ActionName = "缇ゅ彂鐭俊";
+ actionlist.Add(actionEntity4);
+
ViewData["ActionInfo"] = actionlist;
@@ -262,7 +310,6 @@
//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();
}
@@ -321,7 +368,21 @@
}
- var sheng = _projectService.Getsheng();
+ var areaDTOs = _projectService.Getsheng().ToList();
+ foreach (var areaDTO in areaDTOs)
+ {
+ if (areaDTO.CodeId == "510000")
+ {
+ areaDTOs.Remove(areaDTO);
+ break;
+ }
+ }
+ var areaDTOsic = new Area();
+ areaDTOsic.CodeId = "510000";
+ areaDTOsic.Name = "鍥涘窛鐪�";
+ areaDTOsic.ParentId = "0 ";
+ areaDTOs.Insert(1, areaDTOsic);
+ var sheng = areaDTOs;
var shi = _projectService.Getshi(intentionCustomerDTO.Sheng);
var quxian = _projectService.Getquxian(intentionCustomerDTO.City);
var users = _userService.GetList().Where(x => x.IsYwjl == "A").ToList(); ;
@@ -352,9 +413,23 @@
intentionCustomerDTO = _intentionCustomerService.GetByName(name);
-
- var sheng = _projectService.Getsheng();
+
+ var areaDTOs = _projectService.Getsheng().ToList();
+ foreach (var areaDTO in areaDTOs)
+ {
+ if (areaDTO.CodeId == "510000")
+ {
+ areaDTOs.Remove(areaDTO);
+ break;
+ }
+ }
+ var areaDTOsic = new Area();
+ areaDTOsic.CodeId = "510000";
+ areaDTOsic.Name = "鍥涘窛鐪�";
+ areaDTOsic.ParentId = "0 ";
+ areaDTOs.Insert(1, areaDTOsic);
+ var sheng = areaDTOs;
var shi = _projectService.Getshi(intentionCustomerDTO.Sheng);
var quxian = _projectService.Getquxian(intentionCustomerDTO.City);
var users = _userService.GetList().Where(x => x.IsYwjl == "A").ToList(); ;
@@ -416,6 +491,14 @@
data.Creater = curentuser.Id;
data.Createtime = DateTime.Now;
}
+ else
+ {
+ var intentionCustomerDTO = _intentionCustomerService.Get(data.Id);
+ data.Yixiangtime = intentionCustomerDTO.Yixiangtime;
+ data.Yixiang = intentionCustomerDTO.Yixiang;
+ data.Dianxiaozhuanyuan = intentionCustomerDTO.Dianxiaozhuanyuan;
+ data.Zuijinzhuizongtime = intentionCustomerDTO.Zuijinzhuizongtime;
+ }
data.Modifier = curentuser.Id;
data.Modifytime = DateTime.Now;
--
Gitblit v1.9.1