消息提醒

代码/System.Model/T_SMS_InternalMessages.cs

@@ -13,6 +13,7 @@ namespace System.Model
         private string _sms_sendusercode;
         private int? _sms_isread;
         private DateTime? _sms_sendtime;
+        private DateTime? _sms_remindertime;
         private DateTime? _sms_readtime;
         private DateTime? _sms_deletetime;
         private int? _sms_isdelete;
@@ -21,6 +22,9 @@ namespace System.Model
         private int? _sms_type;
         private int? _sms_receivingtype;
         private int? _sms_deptid;
+        private int? _f_id;
+
+        //
         /// <summary>
         /// id,自增
         /// </summary>
@@ -30,6 +34,14 @@ namespace System.Model
             get { return _sms_id; }
         }
         /// <summary>
+        /// 
+        /// </summary>
+        public int? F_ID
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
         /// 短信标题
         /// </summary>
         public string SMS_Title
@@ -87,6 +99,15 @@ namespace System.Model
             get { return _sms_sendtime; }
         }
         /// <summary>
+        /// 提醒时间
+        /// </summary>
+        public DateTime? SMS_Remindertime
+        {
+            set { _sms_remindertime = value; }
+            get { return _sms_remindertime; }
+        }
+        
+        /// <summary>
         /// 阅读时间
         /// </summary>
         public DateTime? SMS_ReadTime

代码/TVShoppingCallCenter_ZLJ/Controllers/InternalMessages/InternalMessagesController.cs

@@ -94,9 +94,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.InternalMessages
         /// <param name="pagesize"></param>
         /// <returns></returns>
         [HttpGet("getMsg")]
-        public async Task<IActionResult> GetListMark(int smstype=-1,int isread=-1, int pageindex = 0, int pagesize = 0)
+        public async Task<IActionResult> GetListMark(int istop=-1,int smstype=-1,int isread=-1, int pageindex = 0, int pagesize = 0)
         {
-            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+           // string user = "8000";
+          string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
             conModels.Add(new ConditionalModel() { FieldName = "SMS_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
@@ -126,11 +127,15 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.InternalMessages
                 conModels.Add(new ConditionalModel() { FieldName = "SMS_ReceiveUserCode", ConditionalType = ConditionalType.Equal, FieldValue = user });
             }
             conModels.Add(new ConditionalModel() { FieldName = "SMS_Remindertime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = DateTime .Now .ToString () });
+            if (istop >-1)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "SMS_IsTop", ConditionalType = ConditionalType.Equal , FieldValue = istop.ToString () });
+            }
             #endregion
             int recordCount = 0;
             if (pageindex > 0 && pagesize > 0)
             {
-                var list = await _sys_internalMessagesrepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount }, "order by SMS_IsTop desc, SMS_SendTime  desc") ;
+                var list = await _sys_internalMessagesrepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount }, "  SMS_SendTime  desc") ;
                 var row = list!=null ? list.Rows.Where(x => (x.SMS_ReceivingType == 0 && x.SMS_Deptid == dept) || (x.SMS_ReceivingType == 1 && x.SMS_ReceiveUserCode == user)):null ;
                 var obj = new
                 {
@@ -143,7 +148,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.InternalMessages
             }
             else
             {
-                var list = await _sys_internalMessagesrepository.GetListALL(conModels, "order by SMS_IsTop desc, SMS_SendTime  desc");
+                var list = await _sys_internalMessagesrepository.GetListALL(conModels, " SMS_SendTime  desc");
                 var row = list!=null ? list.Where(x => (x.SMS_ReceivingType == 0 && x.SMS_Deptid == dept) || (x.SMS_ReceivingType == 1 && x.SMS_ReceiveUserCode == user)):null ;
                 var obj = new
                 {