From 5701636d0554a89cdb6a06327658de75d74f67ed Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 16 一月 2023 13:42:09 +0800
Subject: [PATCH] 添加客户关联企业功能
---
zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs | 74 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
index c467b76..0b53eac 100644
--- a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
@@ -54,7 +54,7 @@
List<LiaotianElasticsearchDTO> liaotianElasticsearchDTOs = new List<LiaotianElasticsearchDTO>();
string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
- string url = $"{api_domain}/liaotian/person/_search";
+ string url = $"{api_domain}/liaotian/_doc/_search";
string question = info;
@@ -122,31 +122,42 @@
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);
- ActionEntity actionEntity2 = new ActionEntity();
- actionEntity2.OpenType = 0;
- actionEntity2.ActionUrl = "";
- actionEntity2.ActionFun = "Print";
- actionEntity2.PageIco = "fa fa-print";
- actionEntity2.ActionName = "鎵撳嵃";
- actionlist.Add(actionEntity2);
+ //ActionEntity actionEntity2 = new ActionEntity();
+ //actionEntity2.OpenType = 0;
+ //actionEntity2.ActionUrl = "";
+ //actionEntity2.ActionFun = "Print";
+ //actionEntity2.PageIco = "fa fa-print";
+ //actionEntity2.ActionName = "鎵撳嵃";
+ //actionlist.Add(actionEntity2);
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Zhuanyi";
- actionEntity3.PageIco = "fa fa-plus";
- actionEntity3.ActionName = "鏁版嵁杞Щ";
- actionlist.Add(actionEntity3);
-
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Zhuanyi";
+ //actionEntity3.PageIco = "fa fa-plus";
+ //actionEntity3.ActionName = "鏁版嵁杞Щ";
+ //actionlist.Add(actionEntity3);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Liaotian/Indexcheck");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").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;
ViewBag.problemtype = _liaotianService.GetSYScode("Liaotian", "problemtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -180,7 +191,7 @@
foreach (var liaotianDTO in liaotianDTOs)
{
string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
- string url = $"{api_domain}/liaotian/person/" + liaotianDTO.Id;
+ string url = $"{api_domain}/liaotian/_doc/" + liaotianDTO.Id;
LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
liaotianElasticsearchDTO.id = liaotianDTO.Id;
@@ -274,6 +285,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Liaotian/Indexcheck");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
LiaotianDTO liaotianDTO = new LiaotianDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -291,8 +305,6 @@
}
ViewData.Model = liaotianDTO;
-
- List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Liaotian/Indexcheck");
ViewData["pageEntities"] = pageEntities;
@@ -348,7 +360,7 @@
{
string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
- string url = $"{api_domain}/liaotian/person/" + data.Id;
+ string url = $"{api_domain}/liaotian/_doc/" + data.Id;
//string requestJson = "{\"id\": \"" + Id + "\",\"question\": \"" + data.Question + "\",\"anwser\": \"" + data.Anwser + "\"}";
try
{
@@ -391,7 +403,7 @@
//string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
- //string url = $"{api_domain}/liaotian/person/"+ data.Id;
+ //string url = $"{api_domain}/liaotian/_doc/"+ data.Id;
//LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
//liaotianElasticsearchDTO.id = data.Id;
//liaotianElasticsearchDTO.question = data.Question;
@@ -523,7 +535,7 @@
string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
- string url = $"{api_domain}/liaotian/person/" + data.Id;
+ string url = $"{api_domain}/liaotian/_doc/" + data.Id;
LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
liaotianElasticsearchDTO.id = data.Id;
liaotianElasticsearchDTO.question = data.Question;
@@ -603,7 +615,7 @@
resultEntity = _liaotianService.saveLiaotian(data);
string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
- string url = $"{api_domain}/liaotian/person/" + data.Id;
+ string url = $"{api_domain}/liaotian/_doc/" + data.Id;
LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
liaotianElasticsearchDTO.id = data.Id;
liaotianElasticsearchDTO.question = data.Question;
@@ -675,7 +687,7 @@
ResultEntity resultEntity = _liaotianService.ModifyStatus(Id, curentuser.Id);
string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
- string url = $"{api_domain}/liaotian/person/" + Id;
+ string url = $"{api_domain}/liaotian/_doc/" + Id;
//string requestJson = "{\"id\": \"" + Id + "\",\"question\": \"" + data.Question + "\",\"anwser\": \"" + data.Anwser + "\"}";
try
{
--
Gitblit v1.9.1