页面修改

Mall.Module.MarketingCenter/SurveyModule.cs

@@ -568,30 +568,17 @@ namespace Mall.Module.MarketingCenter
         #region 活动参与人员
 
         /// <summary>
-        /// 新增修改活动参与人员
+        /// 修改活动参与人员为已完成
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        public bool SetActivitySurveyGuestModule(RB_ActivitySurvey_Guest_Extend model)
+        public bool SetActivitySurveyGuestModule(int Id)
         {
-            bool flag = false;
-            if (model.Id > 0)
-            {
-                Dictionary<string, object> fileds = new Dictionary<string, object>()
-                {
-                    {nameof(RB_ActivitySurvey_Guest_Extend.GuestType),model.GuestType },
-                    {nameof(RB_ActivitySurvey_Guest_Extend.GuestId),model.GuestId },
-                    {nameof(RB_ActivitySurvey_Guest_Extend.StartTime),model.StartTime },
-                    {nameof(RB_ActivitySurvey_Guest_Extend.EndTime),model.EndTime },
-                };
-                flag = activitySurvey_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_ActivitySurvey_Guest_Extend.Id), model.Id));
-            }
-            else
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
             {
-                var newId = activitySurvey_GuestRepository.Insert(model);
-                model.Id = newId;
-                flag = newId > 0;
-            }
+                {nameof(RB_ActivitySurvey_Guest_Extend.IsFinish),1 },
+            };
+            bool flag = activitySurvey_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_ActivitySurvey_Guest_Extend.Id), Id));
             return flag;
         }
 

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("问卷调查提交失败");
         }