PayRequest_GroupPaymentByDateRange 付款申请(团组费用申请相关) --> 保险模块--> 客户名称解密

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2439,7 +2439,10 @@ namespace OASystem.API.Controllers
                         case 82:  // 82	团组客户保险
 
                             string bx_sql = string.Format("select b.Id,b.Pinyin,b.lastName,b.firstName,b.phone from  Grp_TourClientList a, Crm_DeleClient b where a.clientid = b.id and a.isdel = 0 and a.diid = {0}", groupInfo.Id);
-                            List<SimplClientInfo> bx_arr = _sqlSugar.SqlQueryable<SimplClientInfo>(bx_sql).ToList();
+                            var bx_arr = _sqlSugar.SqlQueryable<SimplClientInfo>(bx_sql).ToList();
+
+                            foreach (var bx in bx_arr) EncryptionProcessor.DecryptProperties(bx);
+
 
                             string bx_ClientName = insureDatas.Find(it => payInfo.DIId == it.DiId && payInfo.CId == it.Id)?.ClientName ?? "";
                             string bx_clientName = "-";

OASystem/OASystem.Api/Controllers/MarketCustomerResourcesController.cs

@@ -826,8 +826,56 @@ namespace OASystem.API.Controllers
 
 
 
-        #endregion  
+        #endregion
 
 
+
+        /// <summary>
+        /// 客户资料 操作记录记录查询
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> NewClientDataOperatingRrecord(int userId)
+        {
+
+            var datas = await _sqlSugar.Queryable<Crm_TableOperationRecord, Crm_NewClientData, Sys_Users>((tor, ncd, u) =>
+             new JoinQueryInfos(
+                JoinType.Left, tor.DataId == ncd.Id,
+                JoinType.Left, tor.CreateUserId == u.Id
+                ))
+                .Where((tor, ncd, u) => tor.TableName == "Crm_NewClientData" && tor.CreateUserId == userId && (int)tor.OperationItem > 1)
+                .Select((tor, ncd, u) => new
+                {
+                    tor.PortType,
+                    tor.OperationItem,
+                    tor.DataId,
+                    ncd.Client,
+                    u.CnName,
+                    tor.CreateTime
+                }).ToListAsync();
+
+            var view = new List<dynamic>();
+            foreach (var item in datas)
+            {
+                var text = item.OperationItem.GetDescription();
+
+                view.Add(new {
+                    Client = AesEncryptionHelper.Decrypt(item.Client),
+                    item.PortType,
+                    item.OperationItem,
+                    text = text,
+                    item.DataId,
+                    item.CnName,
+                    item.CreateTime
+                });
+            }
+
+
+            return Ok(JsonView(view));
+
+        }
+
     }
 }

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -6272,16 +6272,6 @@ WHERE
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> StatisticsNowCityOfGroup(StatisticsNowCityOfGroupDto dto)
         {
-
-            var dt1 = GetCountryOrCityCurrentDateTime("美国", "纽约");
-            var dt2 = GetCountryOrCityCurrentDateTime("日本", "东京");
-            var dt3 = GetCountryOrCityCurrentDateTime("加拿大", "多伦多");
-            var dt4 = GetCountryOrCityCurrentDateTime("韩国", "首尔");
-            var dt5 = GetCountryOrCityCurrentDateTime("美国", "华盛顿");
-            var dt6 = GetCountryOrCityCurrentDateTime("印度", "孟买");
-
-
-
             if (!SharingStaticData.PortTypes.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
 
             var nowLable = DateTime.Now.ToString("yyyy-MM-dd");
@@ -6505,7 +6495,7 @@ WHERE
                 Items = g.ToList().Select(gg => new { gg.GroupName, gg.Client, gg.StatusText }).ToList()
             });
 
-
+            if (!result1.Any()) return Ok(JsonView(false,"今天暂无出行的的团!"));
             return Ok(JsonView(result1));
         }