投诉修改

REBORN.Module.DMCModule/ComplainModule.cs

@@ -32,7 +32,7 @@ namespace REBORN.Module.DMCModule
         RB_Complain_DetailRepository complain_DetailRepository = new RB_Complain_DetailRepository();
         RB_Travel_PriceRepository travelPriceRepository = new RB_Travel_PriceRepository();
         RB_Complain_CompensationRepository complainCompensationRepository = new RB_Complain_CompensationRepository();
-
+        RB_Appoint_OPRepository appoint_OPRepository = new RB_Appoint_OPRepository();
         /// <summary>
         /// 获取投诉分页列表
         /// </summary>
@@ -123,7 +123,7 @@ namespace REBORN.Module.DMCModule
         /// </summary>
         /// <param name="orderId">订单id</param>
         /// <returns></returns>
-        public object GetOrderPriceInfo(int orderId, out int GroupId)
+        public object GetOrderPriceInfo(int orderId, out int GroupId, UserInfo userInfo = null)
         {
             RB_Travel_Price_Extend travelPrice = travelPriceRepository.GetOrderPriceInfo(orderId);
             GroupId = travelPrice?.RB_Group_Id ?? 0;
@@ -133,7 +133,30 @@ namespace REBORN.Module.DMCModule
             }
             else
             {
-                var resultData = new { travelPrice.LineID, travelPrice.LineName, LineteamId = travelPrice.ltID, travelPrice.LtName, travelPrice.TCID, travelPrice.DayNum, StartDate = travelPrice.StartDate.Value.ToString("yyyy年MM月dd日"), BackDate = travelPrice.StartDate.Value.AddDays(travelPrice.DayNum - 1).ToString("yyyy年MM月dd日"), OrderId = orderId, Salesman = CacheManager.User.RbUserCache.GetUserLoginInfo(travelPrice.EnterID.ToString()).emName, DriveByWire = "", OpName = CacheManager.User.RbUserCache.GetUserLoginInfo(travelPrice.CreateBy.ToString()).emName, travelPrice.LeaderName, travelPrice.GuideName, travelPrice.OutBranchId };
+                List<RB_Appoint_OP_Extend> opList = new List<RB_Appoint_OP_Extend>();
+                string opName = "";
+                if ((userInfo?.SimpleEasy ?? 0) == 1)
+                {
+                    //查询现有的op信息
+                    opList = appoint_OPRepository.GetList(new RB_Appoint_OP_Extend { OrderId = orderId, ResourceType = ResourceTypeEnum.TeamPrice });
+                    if (opList != null && opList.Any())
+                    {
+                        foreach (var item in opList)
+                        {
+                            opName += (CacheManager.User.RbUserCache.GetUserLoginInfo(item.OPId.ToString()).emName + ",");
+                        }
+                        if (!string.IsNullOrWhiteSpace(opName))
+                        {
+                            opName = opName.TrimEnd(',');
+                        }
+                    }
+                }
+                else
+                {
+                    opName = CacheManager.User.RbUserCache.GetUserLoginInfo(travelPrice.CreateBy.ToString()).emName;
+                }
+
+                var resultData = new { travelPrice.LineID, travelPrice.LineName, LineteamId = travelPrice.ltID, travelPrice.LtName, travelPrice.TCID, travelPrice.DayNum, StartDate = travelPrice.StartDate.Value.ToString("yyyy年MM月dd日"), BackDate = travelPrice.StartDate.Value.AddDays(travelPrice.DayNum - 1).ToString("yyyy年MM月dd日"), OrderId = orderId, Salesman = CacheManager.User.RbUserCache.GetUserLoginInfo(travelPrice.EnterID.ToString()).emName, DriveByWire = "", OpName = opName, travelPrice.LeaderName, travelPrice.GuideName, travelPrice.OutBranchId };
                 return resultData;
             }
         }
@@ -155,9 +178,9 @@ namespace REBORN.Module.DMCModule
         /// <param name="id">投诉id</param>
         /// <param name="orderId">订单id</param>
         /// <returns></returns>
-        public object GetComplainDetial(int id, int orderId)
+        public object GetComplainDetial(int id, int orderId, UserInfo userInfo)
         {
-            var PriceInfo = GetOrderPriceInfo(orderId, out int groupId);
+            var PriceInfo = GetOrderPriceInfo(orderId, out int groupId, userInfo);
             RB_Complain complain = complainRepository.GetEntity(id);
             List<Model.File.FileData> FileDataList = new List<Model.File.FileData>();
             if (!string.IsNullOrEmpty(complain.Annex))
@@ -174,6 +197,7 @@ namespace REBORN.Module.DMCModule
                     item.FileDataList = JsonHelper.DeserializeObject<List<Model.File.FileData>>(item.Annex);
                 }
             }
+
             var ComplainDetial = complainDetialList.Select(t => new { t.ID, t.ComplainID, t.CreateBy, FileDataList = t.FileDataList, EmpName = CacheManager.User.RbUserCache.GetUserLoginInfo(t.CreateBy.Value.ToString()).emName, CreateTime = t.CreateTime.Value.ToString("yyyy年MM月dd日 HH:mm:ss"), DealTime = t.DealTime.HasValue ? t.DealTime.Value.ToString("yyyy年MM月dd日 HH:mm:ss") : "", t.Description, t.DealRemark, t.Level, LevelStr = t.Level.GetEnumName(), t.Time });
             List<RB_Complain_Compensation_Extend> complainCompensationList = complainCompensationRepository.GetListByWhere(new RB_Complain_Compensation_Extend() { ComplainID = id });
             var ComplainCompensation = complainCompensationList;

REBORN.Services.DMCService/ComplainService.cs

@@ -93,7 +93,7 @@ namespace REBORN.Services.DMCService
             JObject parm = JObject.Parse(request.msg.ToString());
             int orderId = parm.GetInt("OrderId");
             int GroupId = 0;
-            var PriceInfo = complainModule.GetOrderPriceInfo(orderId, out GroupId);
+            var PriceInfo = complainModule.GetOrderPriceInfo(orderId, out GroupId, userInfo);
             if (GroupId != userInfo.RB_Group_id)
             {
                 return ApiResult.Failed("订单不正确");
@@ -178,9 +178,10 @@ namespace REBORN.Services.DMCService
 
             int id = parm.GetInt("ID");
             int orderId = parm.GetInt("OrderId");
+            UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
             if (id > 0 && orderId > 0)
             {
-                var data = complainModule.GetComplainDetial(id, orderId);
+                var data = complainModule.GetComplainDetial(id, orderId, userInfo);
                 return ApiResult.Success("获取成功", data: data);
             }
             else