From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位
---
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 572 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 494 insertions(+), 78 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index c5e3cfe..4653ba9 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -21,6 +21,7 @@
using OfficeOpenXml.Drawing.Chart;
using OfficeOpenXml.Style;
using System.IO;
+using DTO.zcUserInfoN_db;
namespace zhengcaioa.Controllers.Customer
{
@@ -36,10 +37,11 @@
private readonly IMapper _mapper;
private readonly IHrDeptService _hrDeptService;
private readonly IPltPageService _pltPageService;
-
+ private readonly IIntentionVisitService _intentionVisitService;
public IntentionCustomerController(ILogger<IntentionCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, IIntentionCustomerService intentionCustomerService, IUserService userService
- , ICooperatecustomCustomerService cooperatecustomCustomerService, IMapper mapper, IHrDeptService hrDeptService, IPltPageService pltPageService)
+ , ICooperatecustomCustomerService cooperatecustomCustomerService, IMapper mapper, IHrDeptService hrDeptService, IPltPageService pltPageService
+ , IIntentionVisitService intentionVisitService)
{
_logger = logger;
_projectService = projectService;
@@ -50,9 +52,160 @@
_mapper = mapper;
_hrDeptService = hrDeptService;
_pltPageService = pltPageService;
+ _intentionVisitService = intentionVisitService;
}
public IActionResult Index()
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Search";
+ //actionEntity.PageIco = "fa fa-search";
+ //actionEntity.ActionName = "鏌ヨ";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+
+ //ActionEntity actionEntity2 = new ActionEntity();
+ //actionEntity2.OpenType = 0;
+ //actionEntity2.ActionUrl = "";
+ //actionEntity2.ActionFun = "Zhuanyi";
+ //actionEntity2.PageIco = "fa fa-exchange";
+ //actionEntity2.ActionName = "杞Щ瀹㈡埛";
+ //actionlist.Add(actionEntity2);
+
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Print";
+ //actionEntity3.PageIco = "fa fa-print";
+ //actionEntity3.ActionName = "鎵撳嵃璧勬枡";
+ //actionlist.Add(actionEntity3);
+
+
+
+ //ActionEntity actionEntity4 = new ActionEntity();
+ //actionEntity4.OpenType = 0;
+ //actionEntity4.ActionUrl = "";
+ //actionEntity4.ActionFun = "Duanxin";
+ //actionEntity4.PageIco = "";
+ //actionEntity4.ActionName = "缇ゅ彂鐭俊";
+ //actionlist.Add(actionEntity4);
+
+
+ //ActionEntity actionEntity5 = new ActionEntity();
+ //actionEntity5.OpenType = 0;
+ //actionEntity5.ActionUrl = "";
+ //actionEntity5.ActionFun = "Youjian";
+ //actionEntity5.PageIco = "";
+ //actionEntity5.ActionName = "缇ゅ彂閭欢";
+ //actionlist.Add(actionEntity5);
+
+
+
+ //ActionEntity actionEntity6 = new ActionEntity();
+ //actionEntity6.OpenType = 0;
+ //actionEntity6.ActionUrl = "";
+ //actionEntity6.ActionFun = "Xinhan";
+ //actionEntity6.PageIco = "";
+ //actionEntity6.ActionName = "鍟嗕笟淇″嚱";
+ //actionlist.Add(actionEntity6);
+
+
+ //ActionEntity actionEntity7 = new ActionEntity();
+ //actionEntity7.OpenType = 0;
+ //actionEntity7.ActionUrl = "";
+ //actionEntity7.ActionFun = "Daochu";
+ //actionEntity7.PageIco = "";
+ //actionEntity7.ActionName = "瀵煎嚭";
+ //actionlist.Add(actionEntity7);
+
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
+ {
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+ ViewData["Creater11"] = curentuser.Id;
+ }
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+
+ foreach (var pageEntity in pageEntities1)
+ {
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = pageEntity.OpenType;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = pageEntity.PageShortcut;
+ actionEntity1.PageIco = pageEntity.PageIco;
+ actionEntity1.ActionName = pageEntity.PageName;
+ actionlist.Add(actionEntity1);
+ }
+ ViewData["ActionInfo"] = actionlist;
+ ViewData["ActionInfo2"] = pageEntities2;
+
+ ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").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();
+
+ var users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
+ users.Insert(0, new { code = "11111", label = "鏃犱笟鍔＄粡鐞�" });
+
+ ViewBag.users = users;
+
+ ViewBag.Creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
+
+ ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).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();
+
+ ViewBag.Baomingtimebegin = "";// DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = "";// DateTime.Now.ToString("yyyy-MM-dd");
+
+ return View();
+
+ }
+
+ public IActionResult GetList(IntentionCustomerDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return new JsonResult(_intentionCustomerService.SearchByPaging(search));
+ }
+
+
+
+
+ public IActionResult Indexhuiyuan()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -64,71 +217,108 @@
actionEntity.PageIco = "fa fa-search";
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+
+ ViewData["ActionInfo"] = actionlist;
+
+
+
+ ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+
+
+
+ ViewBag.Baomingtimebegin = "";//DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = "";//DateTime.Now.ToString("yyyy-MM-dd");
+
+ return View();
+
+ }
+
+ public IActionResult GetListhuiyuan(FrameworkUserSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return new JsonResult(_cooperatecustomCustomerService.SearchByPagingGuanlianHuiyuan(search));
+ }
+
+
+ public IActionResult Indexhuiyuanchakantongshi(string CustomerId)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Search";
+ //actionEntity.PageIco = "fa fa-search";
+ //actionEntity.ActionName = "鏌ヨ";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+
+ ViewData["ActionInfo"] = actionlist;
+
+ ViewBag.CustomerId = CustomerId;
+
+ //ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+
+
+
+ //ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ //ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+
+ return View();
+
+ }
+
+ public IActionResult GetListhuiyuanchakantongshi(string CustomerId)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return new JsonResult(_cooperatecustomCustomerService.GetListFrameworkUser(CustomerId));
+ }
+
+ public IActionResult IndexSelectHuiyuan(string Huiyuanid, string CustomerId)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+
+
+
+
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
ActionEntity actionEntity2 = new ActionEntity();
actionEntity2.OpenType = 0;
actionEntity2.ActionUrl = "";
actionEntity2.ActionFun = "Zhuanyi";
actionEntity2.PageIco = "fa fa-exchange";
- actionEntity2.ActionName = "杞Щ瀹㈡埛";
+ actionEntity2.ActionName = "纭";
actionlist.Add(actionEntity2);
-
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Print";
- actionEntity3.PageIco = "fa fa-print";
- actionEntity3.ActionName = "鎵撳嵃璧勬枡";
- actionlist.Add(actionEntity3);
-
-
-
- ActionEntity actionEntity4 = new ActionEntity();
- actionEntity4.OpenType = 0;
- actionEntity4.ActionUrl = "";
- actionEntity4.ActionFun = "Duanxin";
- actionEntity4.PageIco = "";
- actionEntity4.ActionName = "缇ゅ彂鐭俊";
- actionlist.Add(actionEntity4);
-
-
- ActionEntity actionEntity5 = new ActionEntity();
- actionEntity5.OpenType = 0;
- actionEntity5.ActionUrl = "";
- actionEntity5.ActionFun = "Youjian";
- actionEntity5.PageIco = "";
- actionEntity5.ActionName = "缇ゅ彂閭欢";
- actionlist.Add(actionEntity5);
-
-
-
- ActionEntity actionEntity6 = new ActionEntity();
- actionEntity6.OpenType = 0;
- actionEntity6.ActionUrl = "";
- actionEntity6.ActionFun = "Xinhan";
- actionEntity6.PageIco = "";
- actionEntity6.ActionName = "鍟嗕笟淇″嚱";
- actionlist.Add(actionEntity6);
-
-
- ActionEntity actionEntity7 = new ActionEntity();
- actionEntity7.OpenType = 0;
- actionEntity7.ActionUrl = "";
- actionEntity7.ActionFun = "Daochu";
- actionEntity7.PageIco = "";
- actionEntity7.ActionName = "瀵煎嚭";
- actionlist.Add(actionEntity7);
ViewData["ActionInfo"] = actionlist;
-
+ //ViewData["ActionInfo2"] = pageEntities2;
ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -141,16 +331,175 @@
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();
+
+ ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+
+ ViewBag.Customertype = _liaotianService.GetSYScode("ADM_Askzczbwsydtl", "Customertype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+ ViewBag.Huiyuanid = Huiyuanid;
+ ViewBag.CustomerId = CustomerId;
+
return View();
}
- public IActionResult GetList(IntentionCustomerDTOSearch search)
+
+ public IActionResult GetListSelectHuiyuan(CooperatecustomCustomerDTOSearch search)
{
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
- return new JsonResult(_intentionCustomerService.SearchByPaging(search));
+
+ return new JsonResult(_cooperatecustomCustomerService.SearchByPagingAll(search));
+
+
}
+
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+ [HttpPost]
+ public IActionResult Savezaizhiqiye(string CustomerId,string Huiyuanid,string khlx, string CustomerIddel)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ CustomerGuanlianhuiyuan DTO = new CustomerGuanlianhuiyuan();
+ DTO.Huiyuanid = Huiyuanid;
+ DTO.Customerid = CustomerId;
+ DTO.Customertype = khlx;
+ if (String.IsNullOrEmpty(DTO.Id))
+ {
+ DTO.Creater = curentuser.Id;
+ DTO.Createtime = DateTime.Now;
+ }
+ DTO.Modifier = curentuser.Id;
+ DTO.Modifytime = DateTime.Now;
+ ResultEntity resultEntity = _cooperatecustomCustomerService.saveCustomerGuanlian(DTO, CustomerIddel);
+
+
+
+
+
+ return new JsonResult(resultEntity);
+ }
+
+
+
+ public IActionResult IndexSelect()
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+
+
+
+
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+
+ ActionEntity actionEntity2 = new ActionEntity();
+ actionEntity2.OpenType = 0;
+ actionEntity2.ActionUrl = "";
+ actionEntity2.ActionFun = "Zhuanyi";
+ actionEntity2.PageIco = "fa fa-exchange";
+ actionEntity2.ActionName = "纭";
+ actionlist.Add(actionEntity2);
+
+
+ ViewData["ActionInfo"] = actionlist;
+ //ViewData["ActionInfo2"] = pageEntities2;
+
+ ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").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.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.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).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();
+
+ ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+
+ ViewBag.Customertype = _liaotianService.GetSYScode("ADM_Askzczbwsydtl", "Customertype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+
+ return View();
+
+ }
+
+ public IActionResult GetListSelect(IntentionCustomerDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+
+ if(search.Customertype == "01")
+ {
+ CooperatecustomCustomerDTOSearch search1 = new CooperatecustomCustomerDTOSearch();
+ search1.page = search.page;
+ search1.rows = search.rows;
+ search1.Khly = search.Khly;
+ search1.Hyfl = search.Hyfl;
+ search1.Khlx = search.Khlx;
+ search1.Sheng = search.Sheng;
+ search1.City = search.City;
+ search1.AreaId = search.AreaId;
+ search1.Ywjl = search.Ywjl;
+ search1.Name = search.Name;
+ search1.Createtime = search.Createtime;
+ search1.Shifouweixin = search.Shifouweixin;
+
+
+ return new JsonResult(_cooperatecustomCustomerService.SearchByPaging(search1));
+ }
+ else
+ {
+ return new JsonResult(_intentionCustomerService.SearchByPaging(search));
+ }
+
+ }
+
//[HttpGet("excel")]
@@ -177,7 +526,7 @@
"寤烘。鏃堕棿","瀹㈡埛鏉ユ簮","琛屼笟鍒嗙被","瀹㈡埛绫诲瀷","瀹㈡埛鍚嶇О","瀹㈡埛鍗曚綅","鑱旂郴浜哄井淇�"
,"瀹㈡埛鍦板潃","缃戝潃","鑱旂郴浜哄骇鏈�","鑱旂郴浜烘墜鏈�","鑱旂郴浜篞Q","鑱旂郴浜洪偖绠�",
- "鑱旂郴浜�2濮撳悕","鑱旂郴浜�2鎵嬫満","鑱旂郴浜�2QQ"
+ "鑱旂郴浜�2濮撳悕","鑱旂郴浜�2鎵嬫満","鑱旂郴浜�2QQ","璁块棶娆℃暟"
};
foreach(var columnTitle in columnTitles)
@@ -226,7 +575,8 @@
cell.Value = item.YwTel;
cell = worksheet.Cells[x, y++];
cell.Value = item.YwQq;
-
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Visittimes;
}
@@ -254,26 +604,40 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
-
-
-
-
- List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/IndexYiXiang/");
- foreach(var pageEntity in pageEntities)
+
+
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/IndexYiXiang/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
{
ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = pageEntity.OpenType;
+ actionEntity.OpenType = 0;
actionEntity.ActionUrl = "";
- actionEntity.ActionFun = pageEntity.PageShortcut;
- actionEntity.PageIco = pageEntity.PageIco;
- actionEntity.ActionName = pageEntity.PageName;
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
- }
+
+ }
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+
+ foreach (var pageEntity in pageEntities1)
+ {
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = pageEntity.OpenType;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = pageEntity.PageShortcut;
+ actionEntity1.PageIco = pageEntity.PageIco;
+ actionEntity1.ActionName = pageEntity.PageName;
+ actionlist.Add(actionEntity1);
+ }
ViewData["ActionInfo"] = actionlist;
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -288,7 +652,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();
}
@@ -329,12 +692,20 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
IntentionCustomerDTO intentionCustomerDTO = new IntentionCustomerDTO();
if (!String.IsNullOrEmpty(id))
{
intentionCustomerDTO = _intentionCustomerService.Get(id);
+ IntentionVisitDTOSearch searchEntity = new IntentionVisitDTOSearch();
+ searchEntity.page = 1;
+ searchEntity.rows = 1000;
+ searchEntity.Viscustomer = id;
+ var resultDataEntity = _intentionVisitService.SearchByPaging(searchEntity);
+ ViewData["visitlishi"] = resultDataEntity.DataList;
}
else
{
@@ -345,9 +716,25 @@
intentionCustomerDTO.AreaId = "510107";
intentionCustomerDTO.Name = namecus;
+ ViewData["visitlishi"] = new List<IntentionVisitDTO>();
+
}
- 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(); ;
@@ -378,9 +765,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(); ;
@@ -552,5 +953,20 @@
return View();
}
+
+ /// <summary>
+ /// 鑾峰彇椤圭洰鏄惁宸茬粡褰曞叆
+ /// </summary>
+ /// <param name="shengid">甯俰d</param>
+ /// <returns></returns>
+ [CheckLogin]
+ public string getTitle(string Name, string Id)
+ {
+ var quxian = _intentionCustomerService.GetZhengfuProjectDTOByTitle(Name,Id);
+
+ return JsonConvert.SerializeObject(quxian);
+
+ }
+
}
}
--
Gitblit v1.9.1