From e1064dd08bba4326d19c81a0b9f4da18c2fa462d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 24 十一月 2022 13:22:42 +0800
Subject: [PATCH] 废标公告写入oa
---
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 204 +++++++++++++++++++++++++++++++-------------------
1 files changed, 126 insertions(+), 78 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index 9dfdbf6..dc80ff0 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -36,10 +36,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,6 +51,7 @@
_mapper = mapper;
_hrDeptService = hrDeptService;
_pltPageService = pltPageService;
+ _intentionVisitService = intentionVisitService;
}
public IActionResult Index()
@@ -57,78 +59,104 @@
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 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 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 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 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 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 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);
+ //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();
@@ -156,6 +184,10 @@
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();
}
@@ -268,34 +300,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();
- ActionEntity actionEntity4 = new ActionEntity();
- actionEntity4.OpenType = 0;
- actionEntity4.ActionUrl = "";
- actionEntity4.ActionFun = "Duanxin";
- actionEntity4.PageIco = "";
- actionEntity4.ActionName = "缇ゅ彂鐭俊";
- actionlist.Add(actionEntity4);
-
+ 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();
@@ -350,12 +388,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
{
@@ -366,6 +412,8 @@
intentionCustomerDTO.AreaId = "510107";
intentionCustomerDTO.Name = namecus;
+ ViewData["visitlishi"] = new List<IntentionVisitDTO>();
+
}
var areaDTOs = _projectService.Getsheng().ToList();
--
Gitblit v1.9.1