新增接口

Edu.Model/Entity/Duty/RB_Duty_Content.cs

 using Edu.Common.Enum;
 using System;
+using VT.FW.DB;
 
 namespace Edu.Model.Entity.Duty
 {
 	/// <summary>
 	/// 值班内容实体类
 	/// </summary>
+	[Serializable]
+	[DB(ConnectionName = "DefaultConnection")]
 	public class RB_Duty_Content
     {
 		/// <summary>
@@ -29,29 +32,39 @@ namespace Edu.Model.Entity.Duty
 		public int PlanId { get; set; }
 
 		/// <summary>
-		/// 附件内容
+		/// 突发事项、工作交接(值班类型为2.3是使用)文件
 		/// </summary>
-		public string FileContent { get; set; }
+		public string FileURL { get; set; }
 
 		/// <summary>
-		/// 文本内容
+		/// 突发事项、工作交接(值班类型为2.3是使用)内容
 		/// </summary>
-		public string Content { get; set; }
+		public string OtherContent { get; set; }
 
 		/// <summary>
-		/// 备注
+		/// 突发事项、工作交接(值班类型为2.3是使用)备注
 		/// </summary>
-		public string Remark { get; set; }
+		public string OtherRemark { get; set; }
 
 		/// <summary>
-		/// 创建人
+		/// 值班事项(值班类型为1是使用)填写内容
 		/// </summary>
-		public int CreateBy { get; set; }
+		public string WorkContent { get; set; }
 
 		/// <summary>
-		/// 创建时间
+		/// 值班事项(值班类型为1是使用)是否完成(1-已完成)
 		/// </summary>
-		public DateTime CreateTime { get; set; }
+		public int WorkIsFinish { get; set; }
+
+		/// <summary>
+		/// 事项编号
+		/// </summary>
+		public int ItemId { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
 
 		/// <summary>
 		/// 集团编号
@@ -59,13 +72,23 @@ namespace Edu.Model.Entity.Duty
 		public int Group_Id { get; set; }
 
 		/// <summary>
-		/// 值班事项(值班类型为1是使用)
+		/// 创建人
 		/// </summary>
-		public string PlanContent { get; set; }
+		public int CreateBy { get; set; }
 
 		/// <summary>
-		/// 删除状态
+		/// 创建时间
 		/// </summary>
-		public DateStateEnum Status { get; set; }
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 更新人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 更新时间
+		/// </summary>
+		public DateTime UpdateTime { get; set; }
 	}
 }

Edu.Model/Entity/Duty/RB_Visitor.cs

@@ -29,7 +29,7 @@ namespace Edu.Model.Entity.Duty
 		/// <summary>
 		/// 访客微信号
 		/// </summary>
-		public int? WeChatNum { get; set; }
+		public string WeChatNum { get; set; }
 
 		/// <summary>
 		/// 兴趣课程
@@ -49,7 +49,7 @@ namespace Edu.Model.Entity.Duty
 		/// <summary>
 		/// 关联人员
 		/// </summary>
-		public string CreateBy { get; set; }
+		public int CreateBy { get; set; }
 
 		/// <summary>
 		/// 访客状态(1-正常，2-贵宾，3-黑名单)

Edu.Model/ViewModel/Duty/RB_Duty_Content_ViewModel.cs

-using Edu.Model.Entity.Duty;
+using Edu.Common.Enum.Duty;
+using Edu.Model.Entity.Duty;
 using System;
 using System.Collections.Generic;
 using System.Text;

Edu.Repository/Duty/RB_VisitorRepository.cs

@@ -39,8 +39,49 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Visitor_ViewModel.Group_Id), query.Group_Id);
                 }
+                if (query.PlanId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Visitor_ViewModel.PlanId), query.PlanId);
+                }
             }
             return GetPage<RB_Visitor_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
+
+        /// <summary>
+        /// 获取访客
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public int GetVisitorCountRepository(RB_Visitor_ViewModel query)
+        {
+            int result = 0;
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT COUNT(1) 
+FROM rb_visitor 
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (!string.IsNullOrEmpty(query.WeChatNum) && !string.IsNullOrEmpty(query.Tel))
+                {
+                    builder.AppendFormat(@"  AND ( WeChatNum='{0}' OR Tel='{1}') ", query.WeChatNum, query.Tel);
+                }
+                if (!string.IsNullOrEmpty(query.WeChatNum) && string.IsNullOrEmpty(query.Tel))
+                {
+                    builder.AppendFormat(@"  AND ( WeChatNum='{0}' ) ", query.WeChatNum);
+                }
+                if (string.IsNullOrEmpty(query.WeChatNum) && !string.IsNullOrEmpty(query.Tel))
+                {
+                    builder.AppendFormat(@"  AND ( Tel='{0}' ) ", query.Tel);
+                }
+            }
+            var obj = base.ExecuteScalar(builder.ToString());
+            if (obj != null)
+            {
+                Int32.TryParse(obj.ToString(), out result);
+            }
+            return result;
+        }
     }
 }