销售额页面接口更改

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2663,7 +2663,7 @@ Order By Count Desc");
             if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, MsgTips.CheckAuth));
             #endregion
             #endregion
-            return Ok(await _visitingClientsRep._List(_dto.PortType,_dto.PageIndex,_dto.PageIndex,_dto.DiId,_dto.Search));
+            return Ok(await _visitingClientsRep._List(_dto.PortType,_dto.PageIndex,_dto.PageSize,_dto.DiId,_dto.Search));
         }
 
         /// <summary>

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -280,7 +280,7 @@ namespace OASystem.Domain.AutoMappers
 
             #region 市场客户资料 --> 拜访客户记录
             CreateMap<MarketingSalesVCOperrateDto, Grp_VisitingClients>();
-            CreateMap<MarketingSalesVCSaveInfo, Grp_VisitingClients>();
+            CreateMap<VisitingClientsListView, Grp_VisitingClients>();
             #endregion
         }
     }

OASystem/OASystem.Domain/Dtos/Statistics/MarketingSalesDto.cs

@@ -150,43 +150,10 @@ namespace OASystem.Domain.Dtos.Statistics
 
     public class MarketingSalesVCSaveDto: MarketingSalesUserPageFuncDtoBase
     {
-        public List<MarketingSalesVCSaveInfo> Items { get; set; }
+        public List<VisitingClientsListView> Items { get; set; }
     }
 
 
-    public class MarketingSalesVCSaveInfo
-    {
-        public int DiId { get; set; }
-        /// <summary>
-        /// 拜访时间 - 开始 
-        /// </summary>
-        public DateTime BeginDt { get; set; }
-        /// <summary>
-        /// 拜访时间 - 结束
-        /// </summary>
-        public DateTime EndDt { get; set; }
-        /// <summary>
-        /// 客户单位
-        /// </summary>
-        public string CustomerUnit { get; set; }
-        /// <summary>
-        /// 客户工作
-        /// </summary>
-        public string CustomerJob { get; set; }
-        /// <summary>
-        /// 客户姓名
-        /// </summary>
-        public string CustomerName { get; set; }
-        /// <summary>
-        /// 客户联系方式
-        /// </summary>
-        public string CustomerContact { get; set; }
-        /// <summary>
-        /// 拜访内容
-        /// </summary>
-        public string Remark { get; set; }
-    }
-
     public class MarketingSalesVCDelDto
     {
         public int UserId { get; set; }

OASystem/OASystem.Domain/ViewModels/Groups/VisitingClientsView.cs

@@ -14,12 +14,17 @@ namespace OASystem.Domain.ViewModels.Groups
     public class VisitingClientsListView
     {
         public int RowNumber { get; set; }
-        /// <summary>
-        /// opearate 时
-        /// Id > 0 修改
-        /// Id < 1 添加
+        ///// <summary>
+        ///// opearate 时
+        ///// Id > 0 修改
+        ///// Id < 1 添加
+        ///// </summary>
+        //public int Id { get; set; }
+
+        /// <summary>diid
         /// </summary>
-        public int Id { get; set; }
+        public int DiId { get; set; }
+
         /// <summary>
         /// 拜访时间 - 开始 
         /// </summary>
@@ -48,7 +53,8 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 拜访内容
         /// </summary>
         public string Remark { get; set; }
-        public string Operator { get; set; }
-        public string OperationDt { get; set; }
+        //public string Operator { get; set; }
+        //public string OperationDt { get; set; }
+
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Groups/VisitingClientsRepository.cs

@@ -42,6 +42,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 string sql  = string.Format(@$"Select
 	ROW_NUMBER() Over(Order By BeginDt Asc) As RowNumber,
 	vc.Id,
+	vc.DiId,
 	vc.BeginDt,
 	vc.EndDt,
 	vc.CustomerUnit,
@@ -49,7 +50,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
 	vc.CustomerName,
 	vc.CustomerContact,
 	u.CnName As Operator,
-	vc.CreateTime As OperationDt
+	vc.CreateTime As OperationDt,
+	vc.Remark
 From Grp_VisitingClients vc 
 Left Join Sys_Users u On vc.CreateUserId = u.Id
 Where vc.Isdel = 0 And vc.DiId = {diId}");