Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Model/Entity/MarketingCenter/RB_ActivitySurvey_Guest.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 活动参与人员配置表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_ActivitySurvey_Guest
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 客户类型(1-小程序用户,2-学员用户)
+		/// </summary>
+		public int GuestType { get; set; }
+
+		/// <summary>
+		/// 对应客户类型Id
+		/// </summary>
+		public int GuestId { get; set; }
+
+		/// <summary>
+		/// 是否完成
+		/// </summary>
+		public int IsFinish { get; set; }
+
+		/// <summary>
+		/// 开始时间
+		/// </summary>
+		public DateTime StartTime { get; set; }
+
+		/// <summary>
+		/// 结束时间
+		/// </summary>
+		public DateTime EndTime { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public int Status { get; set; }
+
+		/// <summary>
+		/// 集团
+		/// </summary>
+		public int MallBaseId { get; set; }
+
+		/// <summary>
+		/// 公司
+		/// </summary>
+		public int TenantId { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateDate { get; set; }
+
+		/// <summary>
+		/// 活动编号
+		/// </summary>
+        public int SurveyId { get; set; }
+    }
+}

Mall.Model/Extend/MarketingCenter/RB_ActivitySurvey_Guest_Extend.cs

+using Mall.Model.Entity.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    /// <summary>
+    /// 活动参与人员配置表扩展实体类
+    /// </summary>
+    public class RB_ActivitySurvey_Guest_Extend : RB_ActivitySurvey_Guest
+    {
+
+    }
+}

Mall.Module.MarketingCenter/SurveyModule.cs

@@ -24,7 +24,6 @@ namespace Mall.Module.MarketingCenter
         /// </summary>
         private readonly Rb_GuestSurveyRepository guestSurveyRepository = new Rb_GuestSurveyRepository();
 
-
         /// <summary>
         /// 会员调查选项信息
         /// </summary>
@@ -37,6 +36,11 @@ namespace Mall.Module.MarketingCenter
         /// </summary>
         private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
 
+        /// <summary>
+        /// 活动参与人员配置仓储层对象
+        /// </summary>
+        private readonly RB_ActivitySurvey_GuestRepository activitySurvey_GuestRepository = new RB_ActivitySurvey_GuestRepository();
+
         #region 问卷调查活动管理
         /// <summary>
         /// 获取列表
@@ -181,7 +185,6 @@ namespace Mall.Module.MarketingCenter
 
         #endregion
 
-
         #region 意见调查基础信息
         /// <summary>
         /// 获取列表
@@ -364,7 +367,6 @@ namespace Mall.Module.MarketingCenter
 
         #endregion
 
-
         #region 会员意见信息
 
         /// <summary>
@@ -519,14 +521,14 @@ namespace Mall.Module.MarketingCenter
         /// <returns></returns>
         public List<Rb_GuestSurvey_Extend> GetResultPageListModule(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where)
         {
-            var list= guestSurveyRepository.GetResultPageListRepository(pageIndex, pageSize, out rowsCount, where);
+            var list = guestSurveyRepository.GetResultPageListRepository(pageIndex, pageSize, out rowsCount, where);
             if (list != null && list.Count > 0)
             {
                 string stuIds = string.Join(",", list.Where(qitem => qitem.UserType == 2).Select(qitem => qitem.UserId));
                 List<RB_Account_ViewModel> StuList = new List<RB_Account_ViewModel>();
                 if (!string.IsNullOrEmpty(stuIds))
                 {
-                    StuList= accountRepository.GetStudentExt(new RB_Account_ViewModel()
+                    StuList = accountRepository.GetStudentExt(new RB_Account_ViewModel()
                     {
                         QIds = stuIds
                     });
@@ -562,5 +564,75 @@ namespace Mall.Module.MarketingCenter
             return StuList.FirstOrDefault();
         }
         #endregion
+
+        #region 活动参与人员
+
+        /// <summary>
+        /// 修改活动参与人员为已完成
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetActivitySurveyGuestModule(int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_ActivitySurvey_Guest_Extend.IsFinish),1 },
+            };
+            bool flag = activitySurvey_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_ActivitySurvey_Guest_Extend.Id), Id));
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号删除活动参与人员
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveActivitySurveyGuestModule(int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_ActivitySurvey_Guest_Extend.Status),1 },
+            };
+            bool flag = activitySurvey_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_ActivitySurvey_Guest_Extend.Id), Id));
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号获取参与人员信息
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_ActivitySurvey_Guest_Extend GetActivitySurveyGuestModule(int Id)
+        {
+            var extModel = activitySurvey_GuestRepository.GetEntity<RB_ActivitySurvey_Guest_Extend>(Id);
+            return extModel;
+        }
+
+        /// <summary>
+        /// 获取活动参与人员分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey_Guest_Extend> GetActivitySurveyGuestPageModule(int pageIndex, int pageSize, out long rowsCount, RB_ActivitySurvey_Guest_Extend query)
+        {
+            var list = activitySurvey_GuestRepository.GetActivitySurveyGuestPageRepository(pageIndex, pageSize, out rowsCount, query);
+            return list;
+        }
+
+
+        /// <summary>
+        /// 获取活动参与人员列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey_Guest_Extend> GetActivitySurveyGuestListModule(RB_ActivitySurvey_Guest_Extend query)
+        {
+            var list = activitySurvey_GuestRepository.GetActivitySurveyGuestListRepository(query);
+            return list;
+        }
+        #endregion
     }
 }

Mall.Repository/MarketingCenter/RB_ActivitySurvey_GuestRepository.cs

+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.MarketingCenter
+{
+
+    /// <summary>
+    /// 活动参与人员配置仓储层
+    /// </summary>
+    public class RB_ActivitySurvey_GuestRepository : BaseRepository<RB_ActivitySurvey_Guest>
+    {
+
+        /// <summary>
+        /// 获取活动参与人员分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey_Guest_Extend> GetActivitySurveyGuestPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_ActivitySurvey_Guest_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_ActivitySurvey_Guest AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.Status), 0);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.SurveyId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.SurveyId), query.SurveyId);
+                }
+            }
+            return GetPage<RB_ActivitySurvey_Guest_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取活动参与人员列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey_Guest_Extend> GetActivitySurveyGuestListRepository(RB_ActivitySurvey_Guest_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_ActivitySurvey_Guest AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.Status), 0);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.SurveyId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.SurveyId), query.SurveyId);
+                }
+            }
+            return Get<RB_ActivitySurvey_Guest_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -1244,10 +1244,10 @@ namespace Mall.WebApi.Controllers.Education
             }
             else
             {
-                if (GuestSurvey.Where(x => x.UserId == userInfo.EduStudentId && x.UserType == 2).Count() > 0)
-                {
-                    return ApiResult.Failed("请勿重复参与问卷调查");
-                }
+                //if (GuestSurvey.Where(x => x.UserId == userInfo.EduStudentId && x.UserType == 2).Count() > 0)
+                //{
+                //    return ApiResult.Failed("请勿重复参与问卷调查");
+                //}
                 model.UserId = userInfo.EduStudentId;
             }
             model.TenantId = userInfo.TenantId;
@@ -1316,7 +1316,13 @@ namespace Mall.WebApi.Controllers.Education
                 }
                 model.SurveyOptionsList.Add(modelSurveyOptions);
             }
+
+            int ActivitySurveyGuestId = jObj.GetInt("ActivitySurveyGuestId");
             int flag = surveyModule.SetGuestSurvey(model);
+            if (flag > 0 && model.UserType == 2)
+            {
+                surveyModule.SetActivitySurveyGuestModule(ActivitySurveyGuestId);
+            }
             return flag > 0 ? ApiResult.Success() : ApiResult.Failed("问卷调查提交失败");
         }
 

Mall.WebApi/Controllers/MarketingCenter/SurveyController.cs

@@ -427,5 +427,6 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             return ApiResult.Success("", pagelist);
         }
         #endregion
+ 
     }
 }