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

REBORN.Model/Entity/Dmc/RB_Customer_TicketOrder.cs

@@ -82,6 +82,11 @@ namespace REBORN.Model.Entity.Dmc
         /// </summary>
         public DateTime? UseDate { get; set; }
 
+        /// <summary>
+        /// 行程天数
+        /// </summary>
+        public int UseDay { get; set; }
+
         /// <summary>
         /// 实收
         /// </summary>

REBORN.Model/Entity/Dmc/RB_Travel_SurveyMain.cs

@@ -60,5 +60,10 @@ namespace REBORN.Model.Entity.Dmc
         /// 修改人
         /// </summary>
         public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// Common.Enum.ResourceTypeEnum 问卷调查类型 
+        /// </summary>
+        public string OrderType { get; set; }
     }
 }

REBORN.Model/Extend/Dmc/RB_Travel_SurveyMain_Extend.cs

@@ -13,6 +13,6 @@ namespace REBORN.Model.Extend.Dmc
     [Serializable]
     public class RB_Travel_SurveyMain_Extend: RB_Travel_SurveyMain
     {
-
+        public List<int> OrderTypeList { get; set; }
     }
 }

REBORN.Model/Extend/Dmc/Rb_Travel_Survey_Extend.cs

@@ -35,6 +35,11 @@ namespace REBORN.Model.Extend.Dmc
         /// </summary>
         public int GuestId { get; set; }
 
+        /// <summary>
+        /// 是否单办签证  1是（签证订单）  2否（跟团订单），3-酒店订单，4-邮轮（景点）订单，5-单机票订单
+        /// </summary>
+        public int? IsAllograph { get; set; }
+
         /// <summary>
         /// 团号
         /// </summary>

REBORN.Model/Extend/Sell/RB_CRMGuestOrder_Extend.cs

@@ -619,4 +619,162 @@ namespace REBORN.Model.Extend.Sell
         /// </summary>
         public decimal GuestNum { get; set; }
     }
+
+    public class RB_CRMGuestOrder_Query_GuestSurvey : RB_CRMGuestOrder_Query
+    {
+        /// <summary>
+        /// 只看有评分
+        /// </summary>
+        public int IsScore { get; set; }
+    }
+
+
+    /// <summary>
+    /// 查询返回的数据（7种订单的集合体）
+    /// </summary>
+    public class RB_CRMGuestSurveyOrder_Return
+    {
+        /// <summary>
+        /// 订单ID
+        /// </summary>
+        public int OrderId { get; set; }
+
+        /// <summary>
+        /// 订单类型  
+        /// </summary>
+        public CRMMergeOrderTypeEnum OrderType { get; set; }
+
+        /// <summary>
+        /// 订单类型名称
+        /// </summary>
+        public string OrderTypeName { get => this.OrderType.GetEnumName(); }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string CreateTimeStr { get => this.CreateTime.ToString("yyyy-MM-dd HH:mm"); }
+
+        /// <summary>
+        /// 出发日期/使用日期
+        /// </summary>
+        public string StartDate { get; set; }
+
+
+        /// <summary>
+        /// 是否可以订单操作  2-结团，1-正常
+        /// </summary>
+        public int? Status { get; set; }
+
+
+        /// <summary>
+        /// 结团审核时间
+        /// </summary>
+        public string OutGroupAuditDate { get; set; }
+
+        /// <summary>
+        /// 审核状态  1未审核  2审核通过  3审核拒绝
+        /// </summary>
+        public int OutGroupAuditState { get; set; }
+
+
+        /// <summary>
+        /// 客人名称   （CRM来源的传 crm客户， 其他的传下单时的客户）
+        /// </summary>
+        public string GuestName { get; set; }
+
+        /// <summary>
+        /// 客人电话   （CRM来源的传 crm客户， 其他的传下单时的客户）
+        /// </summary>
+        public string GuestTel { get; set; }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 订单描述
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 订单总金额
+        /// </summary>
+        public decimal Money { get; set; }
+
+        /// <summary>
+        /// 实收
+        /// </summary>
+        public decimal Income { get; set; }
+
+
+        /// <summary>
+        /// 销售
+        /// </summary>
+        public string SaleName { get; set; }
+
+        /// <summary>
+        /// 销售电话
+        /// </summary>
+        public string SalePhone { get; set; }
+
+
+
+        /// <summary>
+        /// 订单币种
+        /// </summary>
+        public string CurrencyName { get; set; }
+
+
+        /// <summary>
+        /// 团队主类型
+        /// </summary>
+        public int TeamType { get; set; }
+
+        /// <summary>
+        /// 团队类型
+        /// </summary>
+        public int PriceTeamType { get; set; }
+
+        /// <summary>
+        ///订单人数
+        /// </summary>
+        public int GuestNum { get; set; }
+
+        /// <summary>
+        ///集团
+        /// </summary>
+        public int GroupId { get; set; }
+
+        /// <summary>
+        ///意见调查对应的类型是否单办签证  1是（签证订单）  2否（跟团订单），3-酒店订单，4-邮轮（景点）订单，5-单机票订单
+        /// </summary>
+        public int IsAllograph { get; set; }
+
+        /// <summary>
+        /// 所属团队
+        /// </summary>      
+        public int? TCID
+        {
+            get;
+            set;
+        }
+
+        public string TCNUM { get; set; }
+
+        /// <summary>
+        /// 整体评分
+        /// </summary>
+        public decimal ScoreNum { get; set; }
+
+        /// <summary>
+        /// 填写意见调查人数
+        /// </summary>
+        public int FinishNum { get; set; }
+    }
 }

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -3500,6 +3500,11 @@ namespace REBORN.Module.SellModule
                     {
                         logContent += $"尾款提醒天数由【{oldOrderModel.FinalPriceTips}】修改为【{demodel.FinalPriceTips}】，";
                     }
+                    if (demodel.UseDay != oldOrderModel.UseDay)
+                    {
+                        logContent += $"行程天数由【{oldOrderModel.UseDay}】修改为【{demodel.UseDay}】，";
+                    }
+                    
                     #endregion
 
                     Dictionary<string, object> keyValues = new Dictionary<string, object>() {
@@ -3522,6 +3527,7 @@ namespace REBORN.Module.SellModule
                     { nameof(RB_Customer_TicketOrder_Extend.SelffetchAddress), demodel.SelffetchAddress},
                     { nameof(RB_Customer_TicketOrder_Extend.FinalPriceTips), demodel.FinalPriceTips},
                     { nameof(RB_Customer_TicketOrder_Extend.UseDate), demodel.UseDate},
+                    { nameof(RB_Customer_TicketOrder_Extend.UseDay), demodel.UseDay},
                     { nameof(RB_Customer_TicketOrder_Extend.GuestInfo), demodel.GuestInfo},
                 };
                     List<WhereHelper> wheres = new List<WhereHelper>() {

REBORN.Module.SellModule/SellOrderModule.cs

@@ -6040,6 +6040,9 @@ namespace REBORN.Module.SellModule
                     tomodel.AirTicketIds = dmodel.AirTicketIds;
                     tomodel.FinalPriceTips = dmodel.FinalPriceTips;
                     tomodel.Meet = dmodel.Meet;
+                    tomodel.ContactName = dmodel.ContactName;
+                    tomodel.ContactMobile = dmodel.ContactMobile;
+                    tomodel.IsLeaderOrder = 0;
                     orderRepository.Update(tomodel, trans);
                     //验证 团款是否收齐
                     if ((tomodel.PreferPrice ?? 0) <= (tomodel.Income ?? 0) + (tomodel.PlatformTax ?? 0) + (tomodel.DiscountMoney ?? 0) + (tomodel.RedEnvelopeMoney ?? 0) - (tomodel.Refund ?? 0))
@@ -6250,6 +6253,7 @@ namespace REBORN.Module.SellModule
                         dmodel.CustomerChildrenId = customerInfoRepository.GetOrderDefaultChildrenId(dmodel.CustomerId ?? 0);
                     }
                     #endregion
+                    dmodel.IsLeaderOrder = 0;
                     var Id = orderRepository.Insert(dmodel, trans);
                     if (Id > 0)
                     {

REBORN.Repository/Dmc/RB_Travel_GuestRepository.cs

@@ -1299,37 +1299,45 @@ WHERE g.Status=0  and g.IsAllograph = 2 AND O.OrderState<>4 ";
             {
                 where += $@" and g.{nameof(RB_Travel_Guest_Extend.IsVisaFree)}={dmodel.IsVisaFree}";
             }
-            if (dmodel.GroupId > 0)
-            {
-                where += $@" and b.{nameof(RB_Travel_Order.RB_Group_Id)}={dmodel.GroupId}";
-            }
+
 
             if (dmodel.IsAllograph.HasValue && dmodel.IsAllograph > 0)
             {
                 where += $@" and g.{nameof(RB_Travel_Guest_Extend.IsAllograph)}={dmodel.IsAllograph}";
+                if (dmodel.GroupId > 0)
+                {
+                    if (dmodel.IsAllograph == 1 || dmodel.IsAllograph == 2)
+                    {
+                        where += $@" and b.{nameof(RB_Travel_Order.RB_Group_Id)}={dmodel.GroupId}";
+                    }
+                    else {
+                        where += $@" and b.GroupId={dmodel.GroupId}";
+                    }
+                }
             }
-            string sql = $@"SELECT g.*,c.StartDate as TCStartDate,d.DayNum as StayDay from rb_travel_guest  as g LEFT JOIN rb_travel_order as b on g.OrderId=b.OrderId 
+            string sql = $@"SELECT g.*,c.StartDate as TCStartDate,b.RB_Group_Id as GroupId ,d.DayNum as StayDay,b.EnterID from rb_travel_guest  as g LEFT JOIN rb_travel_order as b on g.OrderId=b.OrderId 
 LEFT JOIN rb_travel_price  as c on c.TCID=b.TCID
 LEFT JOIN rb_travel_config as d on d.ID=c.ConfigID
 where g.Status=0 and b.OrderState<>4 and IFNULL(b.IsChargeLossOrders,0)<>1 and IFNULL(b.IsLeaderOrder,0)!=1  {where} ORDER BY c.StartDate desc ";
             if (dmodel.IsAllograph == 1)//签证
             {
-                sql = $@"  ";
+                sql = $@" SELECT g.*,b.OrderDate as TCStartDate,0 as StayDay,b.RB_Group_Id,b.EnterID from rb_travel_guest  as g LEFT JOIN RB_Sell_VisaOrder as b on g.OrderId=b.OrderId 
+where g.Status=0 and b.OrderStatus=2   {where} ORDER BY b.OrderDate desc ";
             }
             else if (dmodel.IsAllograph == 3)//酒店
             {
-                sql = $@"SELECT g.*,b.OrderDate as TCStartDate,0 as StayDay from rb_travel_guest  as g LEFT JOIN rb_customer_hotelorder as b on g.OrderId=b.OrderId 
-where g.Status=0 and b.OrderStatus==2   {where} ORDER BY b.OrderDate desc ";
+                sql = $@"SELECT g.*,b.CheckIn as TCStartDate,b.OrderDate as TCEndDate,0 as StayDay,b.GroupId,b.EnterID from rb_travel_guest  as g LEFT JOIN rb_customer_hotelorder as b on g.OrderId=b.OrderId 
+where g.Status=0 and b.OrderStatus=2   {where} ORDER BY b.OrderDate desc ";
             }
             else if (dmodel.IsAllograph == 4)//邮轮
             {
-                sql = $@"SELECT g.*,b.UseDate as TCStartDate,0 as StayDay from rb_travel_guest  as g LEFT JOIN rb_customer_ticketorder as b on g.OrderId=b.OrderId 
-where g.Status=0 and b.OrderStatus==2   {where} ORDER BY b.UseDate desc ";
+                sql = $@"SELECT g.*,b.UseDate as TCStartDate,b.UseDay as StayDay,b.GroupId,b.EnterID from rb_travel_guest  as g LEFT JOIN rb_customer_ticketorder as b on g.OrderId=b.OrderId 
+where g.Status=0 and b.OrderStatus=2   {where} ORDER BY b.UseDate desc ";
             }
             else if (dmodel.IsAllograph == 5)//单机票
             {
-                sql = $@"SELECT g.*,b.DepartTime as TCStartDate,0 as StayDay from rb_travel_guest  as g LEFT JOIN {(Common.Config.IsOnline ? "uat_reborn_sell" : "reborn_sell")}.RB_Ticket_Order as b on g.OrderId=b.OrderId 
-where g.Status=0 and b.OrderStatus==2   {where} ORDER BY b.DepartTime desc ";
+                sql = $@"SELECT g.*,b.DepartTime as TCStartDate,0 as StayDay,b.GroupId,b.EnterID from rb_travel_guest  as g LEFT JOIN {(Common.Config.IsOnline ? "uat_reborn_sell" : "reborn_sell")}.RB_Ticket_Order as b on g.OrderId=b.OrderId 
+where g.Status=0 and b.OrderStatus=1   {where} ORDER BY b.DepartTime desc ";
             }
             return Get<RB_Travel_Guest_Extend>(sql).ToList();
         }

REBORN.Repository/Dmc/RB_Travel_SurveyMainRepository.cs

 using Dapper;
 using REBORN.Common.Enum;
 using REBORN.Model.Entity.Dmc;
+using REBORN.Model.Extend;
 using REBORN.Model.Extend.Dmc;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox;
 
 namespace REBORN.Repository.Dmc
 {
     /// <summary>
     /// 问卷主表仓储层
     /// </summary>
-    public class RB_Travel_SurveyMainRepository:RepositoryBase<RB_Travel_SurveyMain>
+    public class RB_Travel_SurveyMainRepository : RepositoryBase<RB_Travel_SurveyMain>
     {
         /// <summary>
         /// 获取问卷分页列表
@@ -43,7 +45,41 @@ WHERE 1=1
                     parameters.Add("@Title", "%" + query.Title.Trim() + "%");
                 }
             }
-            return GetPage<RB_Travel_SurveyMain_Extend>(pageIndex,pageSize,out rowsCount,builder.ToString(),parameters).ToList();
+            return GetPage<RB_Travel_SurveyMain_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 获取问卷列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Travel_SurveyMain_Extend> GetTravelSurveyMainRepository(RB_Travel_SurveyMain_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*
+FROM RB_Travel_SurveyMain AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Travel_SurveyMain_Extend.State), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.RB_Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Travel_SurveyMain_Extend.RB_Group_Id), query.RB_Group_Id);
+                }
+                if (!string.IsNullOrEmpty(query.Title))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Title ", nameof(RB_Travel_SurveyMain_Extend.Title));
+                    parameters.Add("@Title", "%" + query.Title.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.OrderType))
+                {
+                    builder.AppendFormat(" AND FIND_IN_SET({0},A.{1})  ", query.OrderType, nameof(RB_Travel_SurveyMain_Extend.OrderType));
+                }
+            }
+            return Get<RB_Travel_SurveyMain_Extend>(builder.ToString(), parameters).ToList();
         }
     }
 }

REBORN.Repository/Dmc/Rb_Travel_GuestSurveyRepository.cs

@@ -52,6 +52,10 @@ namespace REBORN.Repository.Dmc
                 {
                     sb.AppendFormat(" and GuestId={0}", where.GuestId);
                 }
+                if (where.IsAllograph > 0)
+                {
+                    sb.AppendFormat(" and IsAllograph={0}", where.IsAllograph);
+                }
                 if (!string.IsNullOrWhiteSpace(where.OrderIds))
                 {
                     sb.AppendFormat(" and OrderID in({0})", where.OrderIds);
@@ -219,7 +223,7 @@ WHERE 1=1 AND A.TCState IN(3) AND A.Status IN(1,2,5)
                 //无评分
                 if (where.IsScore == -1)
                 {
-                    sb.AppendFormat(" AND ifnull(c.Count,0)== 0 ");
+                    sb.AppendFormat(" AND ifnull(c.Count,0)= 0 ");
                     //  sb.AppendFormat(" AND NOT EXISTS(SELECT 1 FROM rb_travel_guestsurvey WHERE TCID=A.TCID) ");
                 }
             }
@@ -276,6 +280,73 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId)
         }
 
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Travel_GuestSurvey_Extend> GetTotalList_V2(Rb_Travel_GuestSurvey_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            string letjoinSql = " left join  rb_travel_order as B on a.OrderID=b.OrderId";
+            string letjoinKey = " ,b.ContactName  as CustomerName,b.ContactMobile as CustomerPhone,b.EnterID ";
+            if (where != null)
+            {
+                if (where.LineId > 0)
+                {
+                    sb.AppendFormat(" and a.LineId={0}", where.LineId);
+                }
+                if (where.LineteamId > 0)
+                {
+                    sb.AppendFormat(" and a.LineteamId={0}", where.LineteamId);
+                }
+                if (where.TCID > 0 && string.IsNullOrEmpty(where.TCIDs))
+                {
+                    sb.AppendFormat(" and a.TCID={0}", where.TCID);
+                }
+                if (where.OrderID > 0)
+                {
+                    sb.AppendFormat(" and a.OrderID={0}", where.OrderID);
+                }
+                if (where.GuestId > 0)
+                {
+                    sb.AppendFormat(" and a.GuestId={0}", where.GuestId);
+                }
+                if (where.IsAllograph > 0)
+                {
+                    sb.AppendFormat(" and a.IsAllograph={0}", where.IsAllograph);
+                    if (where.IsAllograph == 3)
+                    {
+                        letjoinSql = " left join  rb_customer_hotelorder as B on a.OrderID=b.OrderId";
+                        letjoinKey = ",b.ContactName  as CustomerName,b.ContactNumber as CustomerPhone,b.EnterID ";
+                    }
+                    else if (where.IsAllograph == 4)
+                    {
+                        letjoinSql = " left join  rb_customer_ticketorder as B on a.OrderID=b.OrderId";
+                        letjoinKey = " ,b.Name  as CustomerName,b.Mobile as CustomerPhone,b.EnterID ";
+                    }
+                    else if (where.IsAllograph == 5)
+                    {
+                        letjoinSql = $@" left join  {(Common.Config.IsOnline ? "uat_reborn_sell" : "reborn_sell")}.RB_Ticket_Order  as B on a.OrderID=b.OrderId";
+                        letjoinKey = " ,b.EnterID ";
+                    }
+                }
+                if (!string.IsNullOrEmpty(where.TCIDs))
+                {
+                    sb.AppendFormat(" and a.TCID in({0})", where.TCIDs);
+                }
+            }
+            string sql = $@"
+SELECT a.* {letjoinKey},  c.ScoreNum,c.ScoreCount
+       ,CONCAT(ifnull(D.SurName,''),D.`Name`) as GuestName 
+FROM rb_travel_guestsurvey as a 
+{letjoinSql}
+LEFT JOIN rb_travel_guest as d on d.Id=a.GuestId
+LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId) as ScoreCount   from rb_travel_guestsurveydetails where ScoreNum>0 GROUP BY GuestSurveyId )  as c ON a.ID=c.GuestSurveyId
+  where a.state=0 {sb.ToString()}";
+            return Get<Rb_Travel_GuestSurvey_Extend>(sql).ToList();
+        }
+
         /// <summary>
         /// 获取列表
         /// </summary>

REBORN.Services.DMCService/SurveyService.cs

@@ -50,13 +50,27 @@ namespace REBORN.Services.DMCService
                 {
                     CreateByName = CacheManager.User.RbUserCache.GetUserLoginInfo(item.CreateBy.ToString())?.emName ?? "";
                 }
+                List<int> OrderTypeList = new List<int>();
+                List<string> OrderTypeNameList = new List<string>();
+                if (!string.IsNullOrWhiteSpace(item.OrderType))
+                {
+                    OrderTypeList = StringHelper.StringToListInt(item.OrderType);
+                    foreach (var itemN in OrderTypeList)
+                    {
+                        OrderTypeNameList.Add(Common.Plugin.EnumHelper.GetEnumName((Common.Enum.ResourceTypeEnum)itemN));
+                    }
+                }
+
                 list.Add(new
                 {
                     item.MainId,
                     item.Title,
                     item.SubTitle,
                     item.CreateBy,
+                    item.OrderType,
                     CreateByName,
+                    OrderTypeList,
+                    OrderTypeNameList,
                     CreateDate = Common.ConvertHelper.FormatTime(item.CreateDate),
                     UpdateDate = Common.ConvertHelper.FormatTime(item.UpdateDate),
                 });
@@ -75,11 +89,17 @@ namespace REBORN.Services.DMCService
         {
             UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
             JObject parm = JObject.Parse(request.msg.ToString());
+            string orderType = parm.GetStringValue("OrderType");
+            if (string.IsNullOrWhiteSpace(orderType))
+            {
+                return ApiResult.ParamIsNull("请选择意见调查表适用类型");
+            }
             RB_Travel_SurveyMain_Extend model = new RB_Travel_SurveyMain_Extend()
             {
                 MainId = parm.GetInt("MainId"),
                 Title = parm.GetStringValue("Title"),
                 SubTitle = parm.GetStringValue("SubTitle"),
+                OrderType = orderType,
             };
             if (model.MainId > 0)
             {
@@ -93,10 +113,53 @@ namespace REBORN.Services.DMCService
                 model.CreateBy = userInfo.EmployeeId;
                 model.State = Common.Enum.DateStateEnum.Normal;
             }
+            //判断类型是否重复
+            var oldList = module.GetTravelSurveyMainModule(new RB_Travel_SurveyMain_Extend { RB_Group_Id = userInfo.RB_Group_id });
+            List<string> orderTypeList = StringHelper.StringToListString(orderType);
+            foreach (var item in oldList)
+            {
+                if (item.MainId != model.MainId)
+                {
+                    if (!string.IsNullOrWhiteSpace(item.OrderType))
+                    {
+                        var nowOrderTypeList = StringHelper.StringToListString(item.OrderType);
+                        if (orderTypeList.Any(type => nowOrderTypeList.Contains(type)))
+                        {
+                            return ApiResult.Failed(item.Title + "已存在相同的适用类型");
+                        }
+                    }
+                }
+            }
             var flag = module.SetTravelSurveyMainModule(model);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+
+
+        /// <summary>
+        /// 获取供应商类型
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public virtual ApiResult GetSurveyResourceTypeEnumList(RequestParm request)
+        {
+            var List = Common.Plugin.EnumHelper.EnumToList(typeof(Common.Enum.ResourceTypeEnum));
+            List<EnumItem> result = new List<EnumItem>();
+            UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
+            if (userInfo.SimpleEasy == 1)
+            {
+                List<int> notIdList = new List<int> { 2, 4, 5, 6, 7, 9 };
+                foreach (var item in List)
+                {
+                    if (notIdList.FindIndex(x => x == item.Id) == -1)
+                    {
+                        result.Add(item);
+                    }
+                }
+            }
+            return ApiResult.Success(data: result);
+        }
+
         /// <summary>
         /// 根据编号获取问卷信息
         /// </summary>
@@ -382,8 +445,16 @@ namespace REBORN.Services.DMCService
         {
             UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
             Rb_Travel_GuestSurvey_Extend model = JsonConvert.DeserializeObject<Rb_Travel_GuestSurvey_Extend>(request.msg.ToString());
-            var list = module.GetTotalList(model);
-            var obj = list.Select(x => new { x.ID, x.NotesId, x.OrderID, x.GuestName, x.CustomerPhone, EnterName = CacheManager.User.RbUserCache.GetUserLoginInfo(x.EnterID.ToString()).emName, x.CustomerName, ScoreNum = (x.ScoreCount > 0 ? (Convert.ToDecimal(x.ScoreNum) / Convert.ToDecimal(x.ScoreCount)) : 0).ToString("#0.00") }).ToList();
+            var list = new List<Rb_Travel_GuestSurvey_Extend>();
+            if (model.TCID > 0)
+            {
+                list = module.GetTotalList(model);
+            }
+            else
+            {
+                list = module.GetTotalList_V2(model);
+            }
+            var obj = list.Select(x => new { x.ID, x.NotesId, x.OrderID, x.GuestName, x.IsAllograph, x.CustomerPhone, EnterName = CacheManager.User.RbUserCache.GetUserLoginInfo(x.EnterID.ToString()).emName, x.CustomerName, ScoreNum = (x.ScoreCount > 0 ? (Convert.ToDecimal(x.ScoreNum) / Convert.ToDecimal(x.ScoreCount)) : 0).ToString("#0.00") }).ToList();
             return ApiResult.Success("", obj);
         }
 

REBORN.Services.SellService/CRMService.cs

@@ -1023,5 +1023,50 @@ namespace REBORN.Services.SellService
         }
 
         #endregion
+
+        #region 意见调查信息
+        /// <summary>
+        /// 获取订单整合分页列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public virtual ApiResult GetGuestSurveyOrderStatisticsPageList(RequestParm request)
+        {
+            UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
+            ResultPageModel pmodel = JsonHelper.DeserializeObject<ResultPageModel>(request.msg.ToString());
+            JObject parms = JObject.Parse(request.msg.ToString());
+            RB_CRMGuestOrder_Query_GuestSurvey demodel = new RB_CRMGuestOrder_Query_GuestSurvey
+            {
+                OrderId = parms.GetInt("OrderId"),
+                GuestId = parms.GetInt("GuestId"),
+                EnterId = parms.GetInt("EnterId"),
+                OrderState = parms.GetInt("OrderState"),
+                Q_IsCollect = parms.GetInt("Q_IsCollect"),
+                StartTime = parms.GetStringValue("StartTime"),
+                EndTime = parms.GetStringValue("EndTime"),
+                FinishSTime = parms.GetStringValue("FinishSTime"),
+                FinishETime = parms.GetStringValue("FinishETime"),
+                DepartSTime = parms.GetStringValue("DepartSTime"),
+                DepartETime = parms.GetStringValue("DepartETime"),
+                TCNUM = parms.GetStringValue("TCNUM"),
+                ProductName = parms.GetStringValue("ProductName"),
+                CustomerName = parms.GetStringValue("CustomerName"),
+                LureEmpId = parms.GetInt("LureEmpId"),
+                LineId = parms.GetInt("LineId"),
+                TravelType = parms.GetInt("TravelType"),
+                OrderType = (CRMMergeOrderTypeEnum)parms.GetInt("OrderType"),
+                IsSelectCRM = parms.GetInt("IsSelectCRM"),
+                IsMyOrder = parms.GetInt("IsMyOrder"),
+                CommissionType = parms.GetInt("CommissionType"),
+                IsScore = parms.GetInt("isScore"),
+                GroupId = userInfo.RB_Group_id,
+                EmployeeId = userInfo.EmployeeId
+            };
+            var list = crmModule.GetGuestSurveyOrderStatisticsPageList(pmodel.pageIndex, pmodel.pageSize, out long count, demodel);
+            pmodel.count = Convert.ToInt32(count);
+            pmodel.pageData = list;
+            return ApiResult.Success("", pmodel);
+        }
+        #endregion
     }
 }

REBORN.Services.SellService/CustomerOrderService.cs

@@ -1693,6 +1693,7 @@ namespace REBORN.Services.SellService
                 x.Meet,
                 x.FinalPriceTips,
                 x.OtherContractList,
+                x.UseDay,
                 ContractType = Common.Enum.ResourceTypeEnum.TicketCoupons,
                 OrderGuestList = x.OrderGuestList.Select(subItem => new { GuestId = subItem.Id, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.OrderId, Name = subItem?.Name ?? "", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone }),
                 // OrderGuestList = x.OrderGuestList?.Select(z => new { PassportIssued = StringHelper.FormatDate(z?.PassportIssued), PassportExpiry = StringHelper.FormatDate(z?.PassportExpiry), IdCard = z?.IdCard ?? "", Name = z?.Name ?? "", Tel = z?.Tel ?? "", PassportNo = z?.PassportNo ?? "", Birthday = StringHelper.FormatDate(z.Birthday) }),
@@ -2243,6 +2244,7 @@ namespace REBORN.Services.SellService
                     Birthday = parms.GetDateTime("Birthday"),
                     Meet = parms.GetDecimal("Meet"),
                     PeopleNum = parms.GetInt("PeopleNum", 0),//人数
+                    UseDay = parms.GetInt("UseDay", 0),//行程天数
                     EmpBranchId = userInfo.RB_Branch_id,
                     UpdateBy = userInfo.EmployeeId,
                     UpdateTime = now,
@@ -2633,6 +2635,7 @@ namespace REBORN.Services.SellService
                 x.FinalPriceTips,
                 x.OtherContractList,
                 ContractType = Common.Enum.ResourceTypeEnum.TicketCoupons,
+                x.UseDay,
                 OrderGuestList = x.OrderGuestList.Select(subItem => new { GuestId = subItem.Id, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.OrderId, Name = subItem?.Name ?? "", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone }),
                 // OrderGuestList = x.OrderGuestList?.Select(z => new { PassportIssued = StringHelper.FormatDate(z?.PassportIssued), PassportExpiry = StringHelper.FormatDate(z?.PassportExpiry), IdCard = z?.IdCard ?? "", Name = z?.Name ?? "", Tel = z?.Tel ?? "", PassportNo = z?.PassportNo ?? "", Birthday = StringHelper.FormatDate(z.Birthday) }),
                 SupplierModel = new { SupplierId = x?.SupplierModel?.ID ?? 0, SupplierName = x?.SupplierModel?.Name ?? "", Tel = x?.SupplierModel?.Tel ?? "", Contact = x?.SupplierModel?.Contact ?? "", CompanyName = x?.SupplierModel?.CompanyName ?? "", DutyParagraph = x?.SupplierModel?.DutyParagraph ?? "", CompanyPhone = x?.SupplierModel?.CompanyPhone ?? "", OpeningBank = x?.SupplierModel?.OpeningBank ?? "", BankNo = x?.SupplierModel?.BankNo ?? "" },

REBORN.WebApi/AppStting/adminsetting.json

@@ -158,7 +158,7 @@
     "url": ""
   },
   {
-    "cmd": "admin_post_SetEmployeeGroupShow",//设置员工帐号 集团均可查询
+    "cmd": "admin_post_SetEmployeeGroupShow", //设置员工帐号 集团均可查询
     "fullName": "REBORN.Services.UserService.EmployeeService",
     "method": "SetEmployeeGroupShow",
     "url": ""
@@ -434,6 +434,11 @@
     "fullName": "REBORN.Services.DMCService.SurveyService",
     "method": "SetSurveyMain"
   },
+  {
+    "cmd": "survey_post_GetSurveyResourceTypeEnumList", //问卷调查适用类型信息
+    "fullName": "REBORN.Services.DMCService.SurveyService",
+    "method": "GetSurveyResourceTypeEnumList"
+  },
   {
     "cmd": "survey_post_GetSurveyMain", //获取问卷主表信息
     "fullName": "REBORN.Services.DMCService.SurveyService",

REBORN.WebApi/AppStting/singleproductsetting.json

@@ -263,5 +263,10 @@
     "fullName": "REBORN.Services.SellService.CRMService",
     "method": "ExamineOrderChangePrice",
     "checkFormRepeatSubmit": true //验证表单重复提交
+  },
+  {
+    "cmd": "CarSingle_post_GetGuestSurveyOrderStatisticsPageList", //获取意见调查订单整合分页列表
+    "fullName": "REBORN.Services.SellService.CRMService",
+    "method": "GetGuestSurveyOrderStatisticsPageList"
   }
 ]
\ No newline at end of file