新增接口

Edu.Model/Entity/Duty/RB_Visitor.cs

@@ -79,7 +79,7 @@ namespace Edu.Model.Entity.Duty
 		/// <summary>
 		/// 集团编号
 		/// </summary>
-		public int? Group_Id { get; set; }
+		public int Group_Id { get; set; }
 
 		/// <summary>
 		/// 值班编号

Edu.Model/ViewModel/Duty/RB_Visitor_ViewModel.cs

 using Edu.Model.Entity.Duty;
-
 namespace Edu.Model.ViewModel.Duty
 {
     /// <summary>
@@ -7,5 +6,27 @@ namespace Edu.Model.ViewModel.Duty
     /// </summary>
     public class RB_Visitor_ViewModel : RB_Visitor
     {
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 访客状态字符串
+        /// </summary>
+        public string VisitorStatusStr
+        {
+            get
+            {
+                string str = "";
+                switch (this.VisitorStatus)
+                {
+                    case 1: str = "正常"; break;
+                    case 2: str = "贵宾"; break;
+                    case 3: str = "黑名单"; break;
+                }
+                return str;
+            }
+        }
     }
 }

Edu.Module.Duty/DutyPlanModule.cs

@@ -475,8 +475,6 @@ namespace Edu.Module.Duty
                     { nameof(RB_Visitor_ViewModel.CourseName), model.CourseName},
                     { nameof(RB_Visitor_ViewModel.StudyTime), model.StudyTime},
                     { nameof(RB_Visitor_ViewModel.LevelType), model.LevelType},
-                    { nameof(RB_Visitor_ViewModel.Evaluate), model.Evaluate},
-                    { nameof(RB_Visitor_ViewModel.Remark), model.Remark},
                 };
                 flag = visitorRepository.Update(fileds, new WhereHelper(nameof(RB_Visitor_ViewModel.Id), model.Id));
             }

Edu.WebApi/Controllers/Duty/DutyPlanController.cs

@@ -225,5 +225,161 @@ namespace Edu.WebApi.Controllers.Duty
             var flag = dutyPlanModule.DutyCheckModule(Id, Shift, base.UserInfo.Id, Status);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        /// <summary>
+        /// 新增修改值班事项
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetDutyContent()
+        {
+            var model = new RB_Duty_Content_ViewModel()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                PlanShift=base.ParmJObj.GetInt("PlanShift"),
+                PlanType=base.ParmJObj.GetInt("PlanType"),
+                PlanId=base.ParmJObj.GetInt("PlanId"),
+                FileURL = base.ParmJObj.GetStringValue("FileURL"),
+                OtherContent=base.ParmJObj.GetStringValue("OtherContent"),
+                OtherRemark=base.ParmJObj.GetStringValue("OtherRemark"),
+                WorkContent=base.ParmJObj.GetStringValue("WorkContent"),
+                WorkIsFinish = base.ParmJObj.GetInt("WorkIsFinish"),
+                ItemId=base.ParmJObj.GetInt("ItemId"),
+            };
+            model.Group_Id = base.UserInfo.Group_Id;
+            model.Status = Common.Enum.DateStateEnum.Normal;
+            model.CreateBy = base.UserInfo.Id;
+            model.CreateTime = DateTime.Now;
+            model.UpdateBy = base.UserInfo.Id;
+            model.UpdateTime = DateTime.Now;
+            bool flag = dutyPlanModule.SetDutyContentModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 删除值班内容
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveDutyContent()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            var model = dutyPlanModule.RemoveDutyContentModule(Id);
+            return ApiResult.Success(data: model);
+        }
+
+        /// <summary>
+        /// 获取访客分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetVisitorPage()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new RB_Visitor_ViewModel()
+            {
+                WeChatNum=base.ParmJObj.GetStringValue("WeChatNum"),
+                PlanId=base.ParmJObj.GetInt("PlanId"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            List<object> result = new List<object>();
+            var list = dutyPlanModule.GetVisitorPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
+                result.Add(new
+                {
+                    item.Id,
+                    item.Name,
+                    item.Tel,
+                    item.WeChatNum,
+                    item.CourseName,
+                    item.StudyTime,
+                    item.LevelType,
+                    item.CreateByName,
+                    item.VisitorStatus,
+                    item.VisitorStatusStr,
+                    item.Evaluate,
+                    item.VisitTimes,
+                    item.Remark
+                });
+            }
+            pageModel.Count = rowsCount;
+            pageModel.PageData = result;
+            return ApiResult.Success(data: pageModel);
+        }
+
+
+        /// <summary>
+        /// 新增修改访客
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetVisitor()
+        {
+            var model = new RB_Visitor_ViewModel()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                Name = base.ParmJObj.GetStringValue("Name"),
+                Tel = base.ParmJObj.GetStringValue("Tel"),
+                WeChatNum = base.ParmJObj.GetStringValue("WeChatNum"),
+                CourseName = base.ParmJObj.GetStringValue("CourseName"),
+                StudyTime = base.ParmJObj.GetStringValue("StudyTime"),
+                LevelType = base.ParmJObj.GetStringValue("LevelType"),
+                PlanId=base.ParmJObj.GetInt("PlanId"),
+            };
+            model.Group_Id = base.UserInfo.Group_Id;
+            model.Status = Common.Enum.DateStateEnum.Normal;
+            model.CreateBy = base.UserInfo.Id;
+            model.VisitorStatus = 1;
+            bool flag = dutyPlanModule.SetVisitorModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 修改访客状态
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveVisitor()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            int Status = base.ParmJObj.GetInt("Status");
+            var model = dutyPlanModule.RemoveVisitorModule(Id,Status);
+            return ApiResult.Success(data: model);
+        }
+
+        /// <summary>
+        /// 根据编号获取访客信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetVisitor()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            var model = dutyPlanModule.GetVisitorModule(Id);
+            return ApiResult.Success(data: model);
+        }
+
+        /// <summary>
+        /// 修改访客状态
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult UpdateVisitor()
+        {
+            var model = new RB_Visitor_ViewModel()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                VisitorStatus = base.ParmJObj.GetInt("VisitorStatus"),
+                Evaluate = base.ParmJObj.GetStringValue("Evaluate"),
+                Remark = base.ParmJObj.GetStringValue("Remark"),
+            };
+            bool flag = dutyPlanModule.UpdateVisitorModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
     }
 }