获取消息类型 取消是否有消息条数的条件

OASystem/OASystem.Api/Program.cs

@@ -26,7 +26,7 @@ using OASystem.API.OAMethodLib.SignalR.HubService;
 using OASystem.API.OAMethodLib.Auth;
 using OASystem.API.OAMethodLib.Hub.HubClients;
 
-var builder = WebApplication.CreateBuilder(args);
+    var builder = WebApplication.CreateBuilder(args);
 var basePath = AppContext.BaseDirectory;
 
 //ÒýÈëÅäÖÃÎļþ

OASystem/OASystem.Domain/Entities/Groups/Grp_CreditCardPayment.cs

@@ -12,6 +12,21 @@ namespace OASystem.Domain.Entities.Groups
     [SugarTable("Grp_CreditCardPayment")]
     public class Grp_CreditCardPayment:EntityBase
     {
+        /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DIId { get; set; }
+        /// <summary>
+        /// 指向表外键编号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int CId { get; set; }
+        /// <summary>
+        /// 指向标识 设置数据外键编号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int CTable { get; set; }
         /// <summary>
         /// 支付方式
         /// </summary>
@@ -139,21 +154,7 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary> 
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int IsPay { get; set; }
-        /// <summary>
-        /// 团组外键编号
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int DIId { get; set; }
-        /// <summary>
-        /// 指向表外键编号
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int CId { get; set; }
-        /// <summary>
-        /// 指向标识 设置数据外键编号
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int CTable { get; set; }
+        
         /// <summary>
         /// 此次付款百分比
         /// </summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_Customers.cs

@@ -32,7 +32,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 保险费用
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
         public decimal InsuranceCosts { get; set; }
 
         /// <summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_DecreasePayments.cs

@@ -37,7 +37,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 附件地址
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(MAX)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
         public string FilePath { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/Groups/Grp_VisaInfo.cs

@@ -20,12 +20,12 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 签证客户
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string VisaClient { get; set; }
         /// <summary>
         /// 签证费用
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal VisaPrice { get; set; }
         /// <summary>
         /// 币种

OASystem/OASystem.Domain/Entities/Resource/Res_CountryFeeCost.cs

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.Entities.Resource
 {
+    /// <summary>
+    /// 签证费用资料
+    /// </summary>
     [SugarTable("Res_CountryFeeCost")]
     public class Res_CountryFeeCost:EntityBase
     {
@@ -46,7 +49,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 签证费用描述
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(255)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(255)")]
         public string VisaPriceDesc { get; set; }
 
         /// <summary>
@@ -82,13 +85,13 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 加急费用描述 
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(255)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(255)")]
         public string UrgentPriceDesc { get; set; }
 
         /// <summary>
         /// 签证地址
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(255)")]
         public string VisaAddress { get; set; }
 
     }

OASystem/OASystem.Domain/Entities/Resource/Res_InvitationOfficialActivityData.cs

@@ -26,12 +26,12 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 邀请方名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(MAX)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string UnitName { get; set; }
         /// <summary>
         ///邀请方官网
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(150)")]
         public string UnitWeb { get; set; }
         /// <summary>
         /// 涉及领域
@@ -46,7 +46,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 邀请方信息
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(MAX)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
         public string UnitInfo { get; set; }
         /// <summary>
         /// 联系人
@@ -103,5 +103,15 @@ namespace OASystem.Domain.Entities.Resource
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
         public string Fax { get; set; }
+        /// <summary>
+        /// 其他信息
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string OtherInfo { get; set; }
+        /// <summary>
+        /// 背景
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string Background { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/Resource/Res_LocalGuideData.cs

@@ -8,6 +8,7 @@ namespace OASystem.Domain.Entities.Resource
 {
     /// <summary>
     /// 导游地接数据
+    /// old OA TableName：OA2014.dbo.TouristGuideGroundData
     /// </summary>
     [SugarTable("Res_LocalGuideData")]
     public class Res_LocalGuideData : EntityBase
@@ -15,7 +16,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 区域
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string UnitArea { get; set; }
 
         /// <summary>
@@ -27,7 +28,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 地址
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string Address { get; set; }
 
         /// <summary>

OASystem/OASystem.Infrastructure/Repositories/Resource/InvitationOfficialActivityDataRepository.cs

@@ -24,8 +24,6 @@ namespace OASystem.Infrastructure.Repositories.Resource
             _mapper = mapper;
         }
 
-       
-
         /// <summary>
         /// 查询商邀资料列表
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/System/MessageRepository.cs

@@ -185,15 +185,14 @@ namespace OASystem.Infrastructure.Repositories.System
         {
             Result result = new Result() { Code = -1, Msg = "未知错误",Data = new object[] { } };
 
-            //userId
-            string msgSqlWhere = $" And smra.ReadableUId = {dto.UserId}";
-
             //消息类型
             List<NotificationTypeView> messageTypeViews = AppSettingsHelper.Get<NotificationTypeView>("MessageNotificationType");
             List<int> _operationTypeList = messageTypeViews.Where(it =>it.TypeId == 1021).FirstOrDefault().MsgTypeIds.ToList();
             List<int> _taskTypeList = messageTypeViews.Where(it => it.TypeId == 1020).FirstOrDefault().MsgTypeIds.ToList();
             List<int> _noticeTypeList = messageTypeViews.Where(it => it.TypeId == 1022).FirstOrDefault().MsgTypeIds.ToList();
 
+            //userId
+            string msgSqlWhere = $" And smra.ReadableUId = {dto.UserId}";
 
             string msgSql = string.Format(@"Select * From(
                                                 Select row_number() over(order by sm.ReleaseTime Desc) as RowNumber,
@@ -210,59 +209,52 @@ namespace OASystem.Infrastructure.Repositories.System
 
             var data = await _sqlSugar.SqlQueryable<MessageListView>(msgSql).ToListAsync();
 
-            if (data.Count > 0)
+            var msgTypeResult = await _setData.GetSetDataBySTId(_setData, 77);
+            if (msgTypeResult.Code != 0)
             {
-                var msgTypeResult = await _setData.GetSetDataBySTId(_setData, 77);
-                if (msgTypeResult.Code != 0)
-                {
-                    result.Msg = "消息类型不存在!";
-                    return result;
-                }
-                string msgTypeDataStr = JsonConvert.SerializeObject(msgTypeResult.Data);
-                var msgTypeData = JsonConvert.DeserializeObject<List<MessageTypeView>>(msgTypeDataStr);
-
-                //操作通知 OperationNotification
-                var operationNotificationData = data.Where(it => _operationTypeList.Contains(it.Type)).OrderBy(it => it.IsRead).ToList();
-                int operationNotificationDataCount = operationNotificationData.Where(it => it.IsRead == 0).ToList().Count;
+                result.Msg = "消息类型不存在!";
+                return result;
+            }
+            string msgTypeDataStr = JsonConvert.SerializeObject(msgTypeResult.Data);
+            var msgTypeData = JsonConvert.DeserializeObject<List<MessageTypeView>>(msgTypeDataStr);
 
-                //任务通知
-                var taskNotificationData = data.Where(it => _taskTypeList.Contains(it.Type)).OrderBy(it => it.IsRead).ToList();//操作通知所属类型
-                int taskNotificationDataCount = taskNotificationData.Where(it => it.IsRead == 0).ToList().Count;               //任务通知 TaskNotification
+            //操作通知 OperationNotification
+            var operationNotificationData = data.Where(it => _operationTypeList.Contains(it.Type)).OrderBy(it => it.IsRead).ToList();
+            int operationNotificationDataCount = operationNotificationData.Where(it => it.IsRead == 0).ToList().Count;
 
-                //公告通知 notice
-                var noticeNotificationData = data.Where(it => _noticeTypeList.Contains(it.Type)).OrderBy(it => it.IsRead).ToList();//操作通知所属类型
-                int noticeNotificationDataCount = noticeNotificationData.Where(it => it.IsRead == 0).ToList().Count;               //任务通知 TaskNotification
+            //任务通知
+            var taskNotificationData = data.Where(it => _taskTypeList.Contains(it.Type)).OrderBy(it => it.IsRead).ToList();//操作通知所属类型
+            int taskNotificationDataCount = taskNotificationData.Where(it => it.IsRead == 0).ToList().Count;               //任务通知 TaskNotification
 
+            //公告通知 notice
+            var noticeNotificationData = data.Where(it => _noticeTypeList.Contains(it.Type)).OrderBy(it => it.IsRead).ToList();//操作通知所属类型
+            int noticeNotificationDataCount = noticeNotificationData.Where(it => it.IsRead == 0).ToList().Count;               //任务通知 TaskNotification
 
-                foreach (var item in msgTypeData)
-                {
-                    //1021	团组操作通知 1020	任务操作通知 1022 公告通知
-                    if (item.Id == 1020) item.UnReadCount = taskNotificationDataCount;
-                    else if (item.Id == 1021) item.UnReadCount = operationNotificationDataCount;
-                    else if (item.Id == 1022) item.UnReadCount = noticeNotificationDataCount;
-                }
+            foreach (var item in msgTypeData)
+            {
+                //1021	团组操作通知 1020	任务操作通知 1022 公告通知
+                if (item.Id == 1020) item.UnReadCount = taskNotificationDataCount;
+                else if (item.Id == 1021) item.UnReadCount = operationNotificationDataCount;
+                else if (item.Id == 1022) item.UnReadCount = noticeNotificationDataCount;
+            }
 
-                if (dto.PortType == 1 || dto.PortType == 2)  // web/android
-                {
-                    result.Code = 0;
-                    result.Data = msgTypeData;
+            if (dto.PortType == 1 || dto.PortType == 2)  // web/android
+            {
+                result.Code = 0;
+                result.Msg = $"操作成功";
+                result.Data = msgTypeData;
 
-                }
-                else if (dto.PortType == 3)
-                {
-                    result.Code = 0;
-                    result.Data = new
-                    {
-                        MsgTypeData = msgTypeData,
-                        FirstUnreadData = data[0],
-                        UnreadTotalCount = data.Where(it => it.IsRead == 0).ToList().Count,
-                    };
-                }
             }
-            else
+            else if (dto.PortType == 3)
             {
                 result.Code = 0;
-                result.Msg = "暂无消息";
+                result.Msg = $"操作成功";
+                result.Data = new
+                {
+                    MsgTypeData = msgTypeData,
+                    FirstUnreadData = data[0],
+                    UnreadTotalCount = data.Where(it => it.IsRead == 0).ToList().Count,
+                };
             }
 
             return result;