Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Domain/Entities/Resource/Res_OfficialActivities.cs

@@ -59,7 +59,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 公务形式
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int OfficialForm { get; set; }
         /// <summary>
         /// 公务方背景

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

@@ -10,6 +10,7 @@ using OASystem.Domain.Entities.Customer;
 using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.Enums;
 using OASystem.Domain.ViewModels.CRM;
+using OASystem.Domain.ViewModels.QiYeWeChat;
 using SqlSugar;
 using System;
 using System.Collections;
@@ -48,9 +49,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 #region 下拉框初始化数据
                 //负责人下拉框
                 List<dynamic> _Users = new List<dynamic>();
-                List<Sys_Users> users = _sqlSugar.Queryable<Sys_Users>().Where(u => u.IsDel == 0 
-                //&& u.CompanyId == 2
-                ).ToList();
+                List<Sys_Users> users = GetNewExistClient();
 
                 foreach (Sys_Users user in users)   
                 {
@@ -487,7 +486,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                           ("select  d2.Id,d2.Name,d1.NewClientDataId  from Crm_ClientDataAndBusiness d1,Sys_SetData d2 where d1.SetDataId=d2.Id and NewClientDataId=" + item.Id + "  AND d1.ISDEL = 0").ToListAsync();
                             item.AscribedDepartment = AscribedDepartment;
                         }
-                        
+
                         var Data = new
                         {
                             ClientTableData = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientDataView },
@@ -536,17 +535,27 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 }
                 else
                 {
-                    var Data = new
+                    if (dto.PortType == 2 || dto.PortType == 3)
                     {
-                        ClientTableData = new { pageCount = 0, totalPage = 0, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientDataView },
-                        Users = _Users,
-                        Province = _Province,
-                        level = _level,
-                        CustomerClass = _CustomerClass,
-                        ServiceClass = _ServiceClass,
-                        groupNumber = groupNumber.Data,
-                    };
-                    result = new Result() { Code = 0, Msg = "获取成功！",Data = Data };
+                        var Data = new { pageCount = 0, totalPage = 0, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientDataView };
+                        result = new Result() { Code = 0, Msg = "获取成功！", Data = Data };
+                    } 
+                    else
+                    {
+                        var Data = new
+                        {
+
+                            ClientTableData = new { pageCount = 0, totalPage = 0, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientDataView },
+                            Users = _Users,
+                            Province = _Province,
+                            level = _level,
+                            CustomerClass = _CustomerClass,
+                            ServiceClass = _ServiceClass,
+                            groupNumber = groupNumber.Data,
+                        };
+                        result = new Result() { Code = 0, Msg = "获取成功！", Data = Data };
+                    }
+                    
                 }
 
             }

OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -42,12 +42,14 @@ namespace OASystem.Infrastructure.Repositories.Resource
                     Regex r = new Regex("And");
                     sqlWhere = r.Replace(sqlWhere, "Where", 1);
                 }
-                string sql = string.Format(@"select *,(select CnName from Sys_Users where o.CreateUserId=Id) as CreateUserName,(select Name from Sys_SetData
-                                            where Id=o.OfficialForm) as OfficialFormName from Res_OfficialActivities o {0} order by o.CreateTime desc", sqlWhere);
+                string sql = string.Format(@"select *,(select CnName from Sys_Users where o.CreateUserId=Id) as CreateUserName,OfficialForm
+    from Res_OfficialActivities o {0} order by o.CreateTime desc", sqlWhere);
                 List<OfficialActivitiesView> OfficialActivities = await _sqlSugar.SqlQueryable<OfficialActivitiesView>(sql).ToListAsync();
                 List<Sys_SetData> data = await _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToListAsync();
                 if (OfficialActivities.Count != 0)
                 {
+                    List<Sys_SetData> sdList = Query<Sys_SetData>(s => s.STid == 38).ToList();
+
                     if (dto.PageSize == 0 && dto.PageIndex == 0)
                     {
                         foreach (var temp in OfficialActivities)
@@ -59,6 +61,17 @@ namespace OASystem.Infrastructure.Repositories.Resource
                             {
                                 temp.Date = dt.ToString("yyyy-MM-dd HH:mm");
                             }
+
+                            //2024年4月26日 17:43  -蒋金辰 -出访形式
+                            Sys_SetData tempForm = sdList.FirstOrDefault(s => s.Id == temp.OfficialForm);
+                            if (tempForm != null)
+                            {
+                                temp.OfficialFormName = tempForm.Name;
+                            }
+                            else
+                            {
+                                temp.OfficialFormName = "未知";
+                            }
                         }
 
                         result = new Result() { Code = 0, Msg = "查询成功！", Data = OfficialActivities };
@@ -83,6 +96,18 @@ namespace OASystem.Infrastructure.Repositories.Resource
                                 {
                                     OfficialActivities[RowIndex].Date = dt.ToString("yyyy-MM-dd HH:mm");
                                 }
+
+                                //2024年4月26日 17:43  -蒋金辰 -出访形式
+                                Sys_SetData tempForm = sdList.FirstOrDefault(s => s.Id == OfficialActivities[RowIndex].OfficialForm);
+                                if (tempForm != null)
+                                {
+                                    OfficialActivities[RowIndex].OfficialFormName = tempForm.Name;
+                                }
+                                else
+                                {
+                                    OfficialActivities[RowIndex].OfficialFormName = "未知";
+                                }
+
                                 _OfficialActivities.Add(OfficialActivities[RowIndex]);
                             }
                             else