新客户资料分页修改

OASystem/EntitySync/Program.cs

@@ -89,7 +89,7 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Bus_ConfItemInfo)
     //typeof(Bus_ConfItemListInfo)
     //typeof(Res_CountryFeeCost)
-    typeof(Res_MemoInfo)
+    typeof(Res_MemoInfo),
     typeof(Fin_DailyFeePayment), // 财务 - 日付申请
     typeof(Fin_DailyFeePaymentContent)  // 财务 - 日付申请详细类
 });

OASystem/OASystem.Api/Controllers/MarketCustomerResourcesController.cs

@@ -30,7 +30,7 @@ namespace OASystem.API.Controllers
                 Result resTable = await _clientDataRepository.QueryNewClientData(dto);
                 //Result resSelect = await _clientDataRepository.NewClientSelectData();
                 
-                return Ok(JsonView(true, resTable.Msg, resTable));
+                return Ok(JsonView(true, resTable.Msg, resTable.Data));
             }
             catch (Exception)
             {

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -15,6 +15,7 @@ using OASystem.Domain.ViewModels.Resource;
 using OASystem.Domain.ViewModels.System;
 using OASystem.Domain.Dtos.Financial;
 using OASystem.Domain.Entities.Financial;
+using static OASystem.Domain.Dtos.CRM.NewClientDataQueryDto;
 
 namespace OASystem.Domain.AutoMappers
 {

OASystem/OASystem.Domain/ViewModels/CRM/NewClientDataView.cs

@@ -1,4 +1,5 @@
 using OASystem.Domain.Entities.Customer;
+using Org.BouncyCastle.Asn1.Ocsp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,6 +18,16 @@ namespace OASystem.Domain.ViewModels.CRM
         /// 编号
         /// </summary>
         public int RowNumber { get; set; }
+
+        /// <summary>
+        /// 客户分类
+        /// </summary>
+        public string CategoryStr { get; set; }
+
+        /// <summary>
+         /// 地市州Id
+         /// </summary>
+        public string LvlidStr { get; set; }
         /// <summary>
         /// 归属人员
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/CRM/NewClientDataRepository.cs

@@ -131,12 +131,19 @@ namespace OASystem.Infrastructure.Repositories.CRM
                         Regex r = new Regex("And");
                         sqlWhere = r.Replace(sqlWhere, "Where", 1);
                     }
-                    dto.PageIndex = dto.PageIndex * dto.PageSize - dto.PageSize + 1;
-                    dto.PageSize = dto.PageIndex * dto.PageSize;
+                    int pIndex = dto.PageIndex * dto.PageSize - dto.PageSize + 1;
+                    int pSize = dto.PageIndex * dto.PageSize;
                     string sqlNew = string.Format(@"select (SELECT  COUNT(1) FROM Crm_NewClientData s left Join Sys_SetData s1  On s.Lvlid=s1.Id {0}) AS countPage,* from (select ROW_NUMBER() 
                                                     over(order by s.CreateTime desc) RowNumber,s.*,s1.Name as 'LvlName' from Crm_NewClientData s left Join Sys_SetData s1  On s.Lvlid=s1.Id {0}) as co where    
-                                                    RowNumber between {1} and {2} ", sqlWhere,dto.PageIndex,dto.PageSize);
+                                                    RowNumber between {1} and {2} ", sqlWhere, pIndex, pSize);
                     List<NewClientDataView> NewClientDataView = await _sqlSugar.SqlQueryable<NewClientDataView>(sqlNew).ToListAsync();
+                    foreach (var item in NewClientDataView)
+                    {
+                        Sys_SetData CategoryStr = _sqlSugar.Queryable<Sys_SetData>().Single(it => it.Id == item.Category);
+                        item.CategoryStr = CategoryStr.Name;
+                        Sys_SetData lvlStr = _sqlSugar.Queryable<Sys_SetData>().Single(it => it.Id == item.Lvlid);
+                        item.LvlidStr = lvlStr.Name;
+                    }
                     #region 下拉框初始化数据
                     //负责人下拉框
                     List<dynamic> _Users = new List<dynamic>();
@@ -217,47 +224,15 @@ namespace OASystem.Infrastructure.Repositories.CRM
                           ("select d1.*,d2.Name from Crm_ClientDataAndBusiness d1,Sys_SetData d2 where d1.SetDataId=d2.Id and NewClientDataId="+item.Id+"").ToListAsync();
                             item.AscribedDepartment = AscribedDepartment;
                         }
-                        if (dto.PageSize == 0 && dto.PageIndex == 0)
-                        {
-                            var Data = new
-                            {
-                                ClientTableData= NewClientDataView,
-                                Users = _Users,
-                                Province = _Province,
-                                level = _level,
-                                CustomerClass = _CustomerClass,
-                                ServiceClass = _ServiceClass
-                            };
-                            return result = new Result()
-                            {
-                                Code = 0,
-                                Msg = "查询成功",
-                                Data = Data,
-                            };
-                        }
-                        else
-                        {
+                        
                             int count = NewClientDataView[0].countPage;
                             float totalPage = (float)count / dto.PageSize;//总页数
                             if (totalPage == 0) totalPage = 1;
                             else totalPage = (int)Math.Ceiling((double)totalPage);
 
-                            List<NewClientDataView> NewClientView = new List<NewClientDataView>();
-                            for (int i = 0; i < dto.PageSize; i++)
-                            {
-                                var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
-                                if (RowIndex < NewClientDataView.Count)
-                                {
-                                    NewClientView.Add(NewClientDataView[RowIndex]);
-                                }
-                                else
-                                {
-                                    break;
-                                }
-                            }
                             var Data = new
                             {
-                                ClientTableData = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientView },
+                                ClientTableData = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientDataView },
                                 Users = _Users,
                                 Province = _Province,
                                 level = _level,
@@ -270,7 +245,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                                 Msg = "查询成功",
                                 Data = Data
                             };
-                        }
+                        
                     }
                     else
                     {
@@ -374,48 +349,29 @@ namespace OASystem.Infrastructure.Repositories.CRM
                         Regex r = new Regex("And");
                         sqlWhere = r.Replace(sqlWhere, "Where", 1);
                     }
-                    dto.PageIndex = dto.PageIndex * dto.PageSize - dto.PageSize + 1;
-                    dto.PageSize = dto.PageIndex * dto.PageSize;
+                    int pIndex= dto.PageIndex * dto.PageSize - dto.PageSize + 1;
+                    int pSize = dto.PageIndex * dto.PageSize;
                     string sqlNew = string.Format(@"select (SELECT  COUNT(1) FROM Crm_NewClientData s left Join Sys_SetData s1  On s.Lvlid=s1.Id {0}) AS countPage,* from (select ROW_NUMBER() 
                                                     over(order by s.CreateTime desc) RowNumber,s.*,s1.Name as 'LvlName' from Crm_NewClientData s left Join Sys_SetData s1  On s.Lvlid=s1.Id {0}) as co where    
-                                                    RowNumber between {1} and {2} ", sqlWhere, dto.PageIndex, dto.PageSize);
+                                                    RowNumber between {1} and {2} ", sqlWhere, pIndex, pSize);
                     List<NewClientDataView> NewClientDataView = await _sqlSugar.SqlQueryable<NewClientDataView>(sqlNew).ToListAsync();
-                    if (dto.PageSize == 0 && dto.PageIndex == 0)
-                    {
-                        return result = new Result()
-                        {
-                            Code = 0,
-                            Msg = "查询成功",
-                            Data = NewClientDataView,
-                        };
-                    }
-                    else
+                    foreach (var item in NewClientDataView)
                     {
-                        int count = NewClientDataView[0].countPage;
-                        float totalPage = (float)count / dto.PageSize;//总页数
-                        if (totalPage == 0) totalPage = 1;
-                        else totalPage = (int)Math.Ceiling((double)totalPage);
-
-                        List<NewClientDataView> NewClientView = new List<NewClientDataView>();
-                        for (int i = 0; i < dto.PageSize; i++)
-                        {
-                            var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
-                            if (RowIndex < NewClientDataView.Count)
-                            {
-                                NewClientView.Add(NewClientDataView[RowIndex]);
-                            }
-                            else
-                            {
-                                break;
-                            }
-                        }
-                        return result = new Result()
-                        {
-                            Code = 0,
-                            Msg = "查询成功",
-                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientView },
-                        };
+                        Sys_SetData CategoryStr = _sqlSugar.Queryable<Sys_SetData>().Single(it => it.Id == item.Category);
+                        item.CategoryStr = CategoryStr.Name;
+                        Sys_SetData lvlStr = _sqlSugar.Queryable<Sys_SetData>().Single(it => it.Id == item.Lvlid);
+                        item.LvlidStr = lvlStr.Name;
                     }
+                    int count = NewClientDataView[0].countPage;
+                    float totalPage = (float)count / dto.PageSize;//总页数
+                    if (totalPage == 0) totalPage = 1;
+                    else totalPage = (int)Math.Ceiling((double)totalPage);
+                    result = new Result()
+                    {
+                        Code = 0,
+                        Msg = "查询成功",
+                        Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientDataView },
+                    };
                 }
             }
             catch (Exception ex)

OASystem/_Doc/OA2023数据字典.docx

@@ -2944,6 +2944,38 @@ Null
 负责工作
 
 
+14) 团组任务分配：Grp_GroupsTaskAssignment
+                                   字段名
+                                 类型长度
+                                 字段属性
+                                 字段约束
+                                 字段描述
+                                    备注
+DIId
+Int
+Null
+
+团组外键编号
+Grp_DelegationInfo.id
+CTId
+varchar(50)
+Null
+
+ 配置任务（设置数据外键编号）
+Sys_SetData.id
+UId
+varchar(50)
+Null
+
+员工外键编号
+Sys_User.id
+IsEnable
+
+
+
+
+
+
 1. 资源板块
 1) 酒店数据表：Res_HotelData（挪用）
                                    字段名