Merge branch 'master' of http://gitlab.oytour.com/liudong1993/huatu_api

REBORN.Model/Entity/Dmc/Rb_Travel_GuestSurvey.cs

@@ -81,5 +81,14 @@ namespace REBORN.Model.Entity.Dmc
             set;
         }
 
+        /// <summary>
+        /// 集团编号
+        /// </summary>        
+        public int? RB_Group_Id
+        {
+            get;
+            set;
+        }
+
     }
 }

REBORN.Repository/Dmc/Rb_Travel_GuestSurveyRepository.cs

@@ -193,6 +193,10 @@ WHERE 1=1 AND A.TCState IN(3) AND A.Status IN(1,2,5)
                 {
                     sb.AppendFormat(" AND A.TCID={0}", where.TCID);
                 }
+                if ((where?.RB_Group_Id ?? 0) > 0)
+                {
+                    sb.AppendFormat(" AND A.RB_Group_Id={0}", where.RB_Group_Id);
+                }
                 if (!string.IsNullOrEmpty(where.TCNUM))
                 {
                     sb.AppendFormat(" AND A.TCNUM LIKE @TCNUM ");

REBORN.Services.DMCService/SurveyService.cs

@@ -77,9 +77,9 @@ namespace REBORN.Services.DMCService
             JObject parm = JObject.Parse(request.msg.ToString());
             RB_Travel_SurveyMain_Extend model = new RB_Travel_SurveyMain_Extend()
             {
-                MainId=parm.GetInt("MainId"),
-                Title=parm.GetStringValue("Title"),
-                SubTitle=parm.GetStringValue("SubTitle"),
+                MainId = parm.GetInt("MainId"),
+                Title = parm.GetStringValue("Title"),
+                SubTitle = parm.GetStringValue("SubTitle"),
             };
             if (model.MainId > 0)
             {
@@ -151,7 +151,7 @@ namespace REBORN.Services.DMCService
                 Title = parm.GetStringValue("Title"),
             };
             var data = module.GetSurveyPageModule(pmodel.pageIndex, pmodel.pageSize, out long count, model);
-            var list = data.Select(x => new { x.ID,x.MainTitle,x.MainId,x.SurveyType, x.Title, x.IsShow, x.Sort, SurveyTypeStr = REBORN.Common.Plugin.EnumHelper.GetEnumName(x.SurveyType) }).ToList();
+            var list = data.Select(x => new { x.ID, x.MainTitle, x.MainId, x.SurveyType, x.Title, x.IsShow, x.Sort, SurveyTypeStr = REBORN.Common.Plugin.EnumHelper.GetEnumName(x.SurveyType) }).ToList();
             pmodel.count = int.Parse(count.ToString());
             pmodel.pageData = list;
             return ApiResult.Success("", pmodel);
@@ -180,6 +180,7 @@ namespace REBORN.Services.DMCService
                 QStartDate = parm.GetStringValue("reStartDate"),
                 QEndDate = parm.GetStringValue("reEndDate"),
                 IsScore = parm.GetInt("isScore"),
+                RB_Group_Id = userInfo.RB_Group_id,
             };
             var data = module.GetTravelSurveyPageModule(pmodel.pageIndex, pmodel.pageSize, out long count, model);
             List<object> dataList = new List<object>();
@@ -305,16 +306,16 @@ namespace REBORN.Services.DMCService
             {
                 ID = parm.GetInt("ID"),
                 MainId = parm.GetInt("MainId"),
-                SurveyType=(SurveyTypeEnum)parm.GetInt("SurveyType"),
-                Title=parm.GetStringValue("Title"),
-                Sort=parm.GetInt("Sort"),
-                IsShow=parm.GetInt("IsShow"),
-                SurveyOptionsList=new List<Rb_Travel_SurveyOptions_Extend> (),
+                SurveyType = (SurveyTypeEnum)parm.GetInt("SurveyType"),
+                Title = parm.GetStringValue("Title"),
+                Sort = parm.GetInt("Sort"),
+                IsShow = parm.GetInt("IsShow"),
+                SurveyOptionsList = new List<Rb_Travel_SurveyOptions_Extend>(),
             };
             string surveyOptionsListStr = parm.GetStringValue("SurveyOptionsList");
             if (!string.IsNullOrEmpty(surveyOptionsListStr))
-            { 
-               JArray optionArray=JArray.Parse(surveyOptionsListStr);
+            {
+                JArray optionArray = JArray.Parse(surveyOptionsListStr);
                 foreach (var jItem in optionArray)
                 {
                     JObject jobj = JObject.Parse(Common.Plugin.JsonHelper.Serialize(jItem));
@@ -496,7 +497,7 @@ namespace REBORN.Services.DMCService
             if (model != null)
             {
                 int MainId = Common.Config.BusOptionId;
-                var questionList = module.GetSurveyQuestionListModule(new Rb_Travel_Survey() { MainId=MainId});
+                var questionList = module.GetSurveyQuestionListModule(new Rb_Travel_Survey() { MainId = MainId });
                 foreach (var item in questionList)
                 {
                     int ScoreNum = 0;
@@ -504,7 +505,7 @@ namespace REBORN.Services.DMCService
                     var tempAnswer = model.BusSurveyDetailsList.Where(qitem => qitem.SurveyId == item.ID).FirstOrDefault();
                     if (tempAnswer != null)
                     {
-                        ScoreNum = tempAnswer?.ScoreNum??0;
+                        ScoreNum = tempAnswer?.ScoreNum ?? 0;
                         TextContent = tempAnswer?.TextContent ?? "";
                     }
                     if (item.SurveyType == SurveyTypeEnum.MultiSelect || item.SurveyType == SurveyTypeEnum.TheRadio)

REBORN.Services.SellService/MiniProgramService.cs

@@ -1132,6 +1132,7 @@ namespace REBORN.Services.SellService
             model.OrderID = modelSurvey.FirstOrDefault().OrderID;
             model.TCID = modelSurvey.FirstOrDefault().TCID;
             model.State = DateStateEnum.Normal;
+            model.RB_Group_Id = priceModel.RB_Group_Id;
             var scoreList = modelSurvey.Where(x => x.SurveyType == Common.Enum.Dmc.SurveyTypeEnum.Score);
             if (scoreList != null && scoreList.Any())
             {