From c960e73212f50d4f24652eee985c55d5ba496f00 Mon Sep 17 00:00:00 2001 From: feng <279202647@qq.com> Date: Tue, 28 Feb 2023 22:22:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=94=BE=E5=BC=83=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HuiYan/catsBusiness.cs | 2 +- .../HuiYan/itemlabelsBusiness.cs | 23 +++++++++++++++- .../HuiYan/teamitemsBusiness.cs | 27 +++++++++++++++++++ .../HuiYan/IteamitemsBusiness.cs | 2 ++ .../齐越慧眼/齐越慧眼/ApiHelper.cs | 5 ++-- 5 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/Coldairarrow.Business/HuiYan/catsBusiness.cs b/src/Coldairarrow.Business/HuiYan/catsBusiness.cs index fb8566b..f634cab 100644 --- a/src/Coldairarrow.Business/HuiYan/catsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/catsBusiness.cs @@ -367,7 +367,7 @@ namespace Coldairarrow.Business.HuiYan public AjaxResult AddKeyWord(KeyWordDto model) { - var has = GetIQueryable().Count(c => c.Name == model.KeyWord && c.TeamId == _operator.TeamId && c.Type == model.Type)>0; + var has = GetIQueryable().Count(c => c.Name == model.KeyWord && c.TeamId == _operator.TeamId && c.Type == model.Type&&c.ParentId==model.LastCat)>0; if (has) { return Error("该品类词已存在！"); diff --git a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs index 155a314..f36bccd 100644 --- a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs @@ -78,7 +78,7 @@ namespace Coldairarrow.Business.HuiYan #endregion - public List GetLabelByItemIds(List ids, ItemPlatform platform) + public List GetLabelByItemIds(List ids, ItemPlatform platform) { Expression> select = (a, b) => new ItemlabelInfoDto { @@ -122,6 +122,27 @@ namespace Coldairarrow.Business.HuiYan } }); + + var teamItems = iteamitemsBusiness.GetListByState(3, ids).Result; + teamItems.ForEach(item => + { + list.Add(new ItemlabelInfoDto() + { + GoodsId = item.GoodsId, + CreateTime = item.CreateTime, + CreatorId = item.CreatorId, + Deleted = item.Deleted, + GoodsUrl = item.GoodsUrl, + HasFilter = item.HasFilter, + Id = item.Id, + IsMyTeam = true, + IsFilter = true, + Platform = item.Platform, + TeamId = item.TeamId, + UserId = item.UserId + }); + }); + return list; } diff --git a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs index 2b5f7f1..e8ae54e 100644 --- a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs @@ -163,6 +163,33 @@ namespace Coldairarrow.Business.HuiYan } } + public async Task< List> GetListByState(int state,Listids) + { + Expression> select = (a, b) => new TeamitemDto + { + GoodsId = b.GoodsId, + HasFilter = b.HasFilter, + Platform = b.Platform, + GoodsUrl = b.GoodsUrl, + Extensions = Newtonsoft.Json.JsonConvert.DeserializeObject>(a.ExtensionJson) + }; + + select = select.BuildExtendSelectExpre(); + + var q_titem = GetIQueryable(); + var q = from a in q_titem.AsExpandable() + join b in Db.GetIQueryable() on a.ItemId equals b.Id into ab + from b in ab.DefaultIfEmpty() + select @select.Invoke(a, b); + //查询对应状态 + var where = LinqHelper.True(); + where = where.And(c => c.State == state); + where = where.And(c => _operator.SonTeamList.Contains(c.TeamId)); + where = where.And(c => ids.Contains(c.GoodsId)); + return await q.Where(where).ToListAsync(); + + } + public AjaxResult AddItem(TeamitemDto model) { diff --git a/src/Coldairarrow.IBusiness/HuiYan/IteamitemsBusiness.cs b/src/Coldairarrow.IBusiness/HuiYan/IteamitemsBusiness.cs index 294e5d8..2b212f6 100644 --- a/src/Coldairarrow.IBusiness/HuiYan/IteamitemsBusiness.cs +++ b/src/Coldairarrow.IBusiness/HuiYan/IteamitemsBusiness.cs @@ -28,5 +28,7 @@ namespace Coldairarrow.Business.HuiYan AjaxResult GetTjInfo(DateTime start, DateTime end); bool UpdateTaskSuccess(List logs); + + Task> GetListByState(int state,List ids); } } \ No newline at end of file diff --git a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs index e3d7b29..00bf166 100644 --- a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs +++ b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs @@ -13,8 +13,8 @@ namespace 齐越慧眼 public class ApiHelper { #if LOCATION - //public static string ApiBase { get; set; } = "http://localhost:5000"; - public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com"; + public static string ApiBase { get; set; } = "http://localhost:5000"; + //public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com"; #else public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com"; @@ -31,6 +31,7 @@ namespace 齐越慧眼 { #if LOCATION + //return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA5MzA3MDA4MTU5NzQ0IiwidGVhbUlkIjoiMTQzOTg5ODUxNDIyMDkxMjY0MCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE3MDgzMzM1NDF9.6WCMQzB8iRtYsOZl88YPJrmZVYuuvboO4R8dAQHdLuE"; //测试001 return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzAwMDEzMTg2NjgyODgwIiwidGVhbUlkIjoiMTU0NzM5OTExMTU1NTE1ODAxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQzODI3NDcyNTg0NzA0IiwiZXhwIjoxNzA3ODExMjQxfQ.Vw_BhiUJnT_Sxm7QzbD2-lSguQI_pA9BDbTcQQ-sfQo";