From cd91a3301e8b63d4b39255abbff3e74c14fadf92 Mon Sep 17 00:00:00 2001
From: Abbh1 <86962549+Abbh1@users.noreply.github.com>
Date: Tue, 14 Nov 2023 16:53:40 +0800
Subject: [PATCH] V1.0.0

---
 .../EmotionManage/EmoticonDatas/EmoticonDataApiDto.cs    | 3 +--
 .../EmotionManage/EmoticonDatas/EmoticonDataDto.cs       | 4 +++-
 .../Business/EmotionManage/EmoticonDatas/EmoticonData.cs | 9 +++++++++
 .../EmotionManage/EmoticonDatas/EmoticonDataVo.cs        | 6 ++++++
 .../EmoticonDatas/EmoticonDataServiceApi.cs              | 4 ++--
 .../EmotionManage/EmoticonDatas/EmoticonDataService.cs   | 1 +
 .../EmoticonDatas/EmoticonDataController.cs              | 1 +
 7 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ARW.Model/Dto/Api/EmotionManage/EmoticonDatas/EmoticonDataApiDto.cs b/ARW.Model/Dto/Api/EmotionManage/EmoticonDatas/EmoticonDataApiDto.cs
index 4126b1a..5997dff 100644
--- a/ARW.Model/Dto/Api/EmotionManage/EmoticonDatas/EmoticonDataApiDto.cs
+++ b/ARW.Model/Dto/Api/EmotionManage/EmoticonDatas/EmoticonDataApiDto.cs
@@ -15,8 +15,7 @@ namespace ARW.Model.Dto.Api.EmotionManage.EmoticonDatas
     public class EmoticonDataQueryDtoApi : PagerInfo
     {
         public long EmoticonCategoryGuid { get; set; }
-        public string EmoticonDataName { get; set; }
-
+        public string Search { get; set; }
         public bool IsLastUpdate { get; set; } = false;
     }
 
diff --git a/ARW.Model/Dto/Business/EmotionManage/EmoticonDatas/EmoticonDataDto.cs b/ARW.Model/Dto/Business/EmotionManage/EmoticonDatas/EmoticonDataDto.cs
index 91ce6b3..04270e0 100644
--- a/ARW.Model/Dto/Business/EmotionManage/EmoticonDatas/EmoticonDataDto.cs
+++ b/ARW.Model/Dto/Business/EmotionManage/EmoticonDatas/EmoticonDataDto.cs
@@ -25,6 +25,7 @@ namespace ARW.Model.Dto.Business.EmotionManage.EmoticonDatas
 
         [Required(ErrorMessage = "图片不能为空")]
         public string EmoticonDataImg { get; set; }
+        public string GetNum { get; set; }
 
         [Required(ErrorMessage = "排序不能为空")]
         public int EmoticonDataSort { get; set; }
@@ -48,7 +49,8 @@ namespace ARW.Model.Dto.Business.EmotionManage.EmoticonDatas
         public long? EmoticonCategoryGuid { get; set; }
 
         public string EmoticonDataName { get; set; }
-    
+        public string GetNum { get; set; }
+
         public string ids { get; set; }
     }
 
diff --git a/ARW.Model/Models/Business/EmotionManage/EmoticonDatas/EmoticonData.cs b/ARW.Model/Models/Business/EmotionManage/EmoticonDatas/EmoticonData.cs
index ab5ffb9..00093d9 100644
--- a/ARW.Model/Models/Business/EmotionManage/EmoticonDatas/EmoticonData.cs
+++ b/ARW.Model/Models/Business/EmotionManage/EmoticonDatas/EmoticonData.cs
@@ -63,6 +63,15 @@ namespace ARW.Model.Models.Business.EmotionManage.EmoticonDatas
         public string EmoticonDataImg { get; set; }
 
 
+        /// <summary>
+        /// 描述 :获取码 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "获取码")]
+        [SugarColumn(ColumnName = "get_num")]
+        public string GetNum { get; set; }
+
+
         /// <summary>
         /// 描述 :排序 
         /// 空值 : false  
diff --git a/ARW.Model/Vo/Business/EmotionManage/EmoticonDatas/EmoticonDataVo.cs b/ARW.Model/Vo/Business/EmotionManage/EmoticonDatas/EmoticonDataVo.cs
index 069f3f4..c8f59ea 100644
--- a/ARW.Model/Vo/Business/EmotionManage/EmoticonDatas/EmoticonDataVo.cs
+++ b/ARW.Model/Vo/Business/EmotionManage/EmoticonDatas/EmoticonDataVo.cs
@@ -58,6 +58,12 @@ namespace ARW.Model.Vo.Business.EmotionManage.EmoticonDatas
         [EpplusTableColumn(Header = "表情包图片")]
         public string EmoticonDataImg { get; set; }
 
+        /// <summary>
+        /// 描述 :获取码 
+        /// </summary>
+        [EpplusTableColumn(Header = "表情包获取码")]
+        public string GetNum { get; set; }
+
 
         /// <summary>
         /// 描述 :排序 
diff --git a/ARW.Service/Api/BusinessService/EmotionManage/EmoticonDatas/EmoticonDataServiceApi.cs b/ARW.Service/Api/BusinessService/EmotionManage/EmoticonDatas/EmoticonDataServiceApi.cs
index 8280273..66033b5 100644
--- a/ARW.Service/Api/BusinessService/EmotionManage/EmoticonDatas/EmoticonDataServiceApi.cs
+++ b/ARW.Service/Api/BusinessService/EmotionManage/EmoticonDatas/EmoticonDataServiceApi.cs
@@ -49,8 +49,8 @@ namespace ARW.Service.Api.BusinessService.EmotionManage.EmoticonDatas
             predicate = predicate.AndIF(parm.EmoticonCategoryGuid != 0, s => s.EmoticonCategoryGuid == parm.EmoticonCategoryGuid);
             var query = _EmoticonDataRepository
                 .Queryable()
-                .LeftJoin<EmotionCategory>((s,c) => s.EmoticonCategoryGuid == c.EmotionCategoryGuid)
-                .WhereIF(!string.IsNullOrEmpty(parm.EmoticonDataName), (s,c) => s.EmoticonDataName.Contains(parm.EmoticonDataName) || c.EmotionCategoryName.Contains(parm.EmoticonDataName))
+                .LeftJoin<EmotionCategory>((s, c) => s.EmoticonCategoryGuid == c.EmotionCategoryGuid)
+                .WhereIF(!string.IsNullOrEmpty(parm.Search), (s, c) => s.EmoticonDataName.Contains(parm.Search) || c.EmotionCategoryName.Contains(parm.Search) || s.GetNum == parm.Search)
                 .Where(predicate.ToExpression())
                 .OrderByIF(parm.IsLastUpdate == false, s => s.EmoticonDataSort, OrderByType.Asc)
                 .OrderByIF(parm.IsLastUpdate == true, s => s.Create_time, OrderByType.Desc)
diff --git a/ARW.Service/Business/BusinessService/EmotionManage/EmoticonDatas/EmoticonDataService.cs b/ARW.Service/Business/BusinessService/EmotionManage/EmoticonDatas/EmoticonDataService.cs
index 15911a7..1681370 100644
--- a/ARW.Service/Business/BusinessService/EmotionManage/EmoticonDatas/EmoticonDataService.cs
+++ b/ARW.Service/Business/BusinessService/EmotionManage/EmoticonDatas/EmoticonDataService.cs
@@ -61,6 +61,7 @@ namespace ARW.Service.Business.BusinessService.EmotionManage.EmoticonDatas
                     EmoticonDataName = s.EmoticonDataName,
                     EmoticonDataImg = s.EmoticonDataImg,
                     EmoticonDataSort = s.EmoticonDataSort,
+                    GetNum = s.GetNum
                 });
 
 
diff --git a/ARW.WebApi/Controllers/Business/EmotionManage/EmoticonDatas/EmoticonDataController.cs b/ARW.WebApi/Controllers/Business/EmotionManage/EmoticonDatas/EmoticonDataController.cs
index 5d543ab..7322e86 100644
--- a/ARW.WebApi/Controllers/Business/EmotionManage/EmoticonDatas/EmoticonDataController.cs
+++ b/ARW.WebApi/Controllers/Business/EmotionManage/EmoticonDatas/EmoticonDataController.cs
@@ -96,6 +96,7 @@ namespace ARW.WebApi.Controllers.Business.EmotionManage.EmoticonDatas
                     EmoticonCategoryGuid = parm.EmoticonCategoryGuid,
                     EmoticonDataImg = item,
                     EmoticonDataSort = 100,
+                    GetNum = parm.GetNum,
                     Create_by = user.UserName,
                     Create_time = DateTime.Now,
                 };