修复项目编译错误和优化功能

- 修复LqKhxxService.cs中UserEntity类型未找到的错误 - 添加正确的using语句解决命名空间问题 - 优化开单记录表和拓客管理的导出功能 - 修复Excel导出中的数组越界错误 - 完善前端拓客管理页面的显示和交互 - 项目现在可以正常编译和运行

修复项目编译错误和优化功能
- 修复LqKhxxService.cs中UserEntity类型未找到的错误 - 添加正确的using语句解决命名空间问题 - 优化开单记录表和拓客管理的导出功能 - 修复Excel导出中的数组越界错误 - 完善前端拓客管理页面的显示和交互 - 项目现在可以正常编译和运行
“wangming”
1 parent e26252dc
Showing 7 changed files with 50 additions and 35 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs
netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs
@@ -13,156 +13,156 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// 开单编号
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 单据门店
         /// </summary>
         public string djmd { get; set; }
-        
+
         /// <summary>
         /// 金三角
         /// </summary>
         public string jsj { get; set; }
-        
+
         /// <summary>
         /// 开单日期
         /// </summary>
         public DateTime? kdrq { get; set; }
-        
+
         /// <summary>
         /// 顾客类型
         /// </summary>
         public string gjlx { get; set; }
-        
+
         /// <summary>
         /// 合作机构
         /// </summary>
         public string hgjg { get; set; }
-        
+
         /// <summary>
         /// 整单业绩
         /// </summary>
         public decimal zdyj { get; set; }
-        
+
         /// <summary>
         /// 实付业绩
         /// </summary>
         public decimal sfyj { get; set; }
-        
+
         /// <summary>
         /// 欠款
         /// </summary>
         public decimal qk { get; set; }
-        
+
         /// <summary>
         /// 储扣方式
         /// </summary>
         public string ckfs { get; set; }
-        
+
         /// <summary>
         /// 储扣明细
         /// </summary>
         public string ckmx { get; set; }
-        
+
         /// <summary>
         /// 付款方式
         /// </summary>
         public string fkfs { get; set; }
-        
+
         /// <summary>
         /// 付款医院
         /// </summary>
         public string fkyy { get; set; }
-        
+
         /// <summary>
         /// 付款判断
         /// </summary>
         public string fkpd { get; set; }
-        
+
         /// <summary>
         /// 客户来源
         /// </summary>
         public string khly { get; set; }
-        
+
         /// <summary>
         /// 推荐人
         /// </summary>
         public string tjr { get; set; }
-        
+
         /// <summary>
         /// 是否首开订单
         /// </summary>
         public string sfskdd { get; set; }
-        
+
         /// <summary>
         /// 简介
         /// </summary>
         public string jj { get; set; }
-        
+
         /// <summary>
         /// 上传文件
         /// </summary>
         public List<FileControlsModel> scwj { get; set; }
-        
+
         /// <summary>
         /// 会员签字
         /// </summary>
         public List<FileControlsModel> hyqz { get; set; }
-        
+
         /// <summary>
         /// 备注
         /// </summary>
         public string bz { get; set; }
-        
+
         /// <summary>
         /// 开单会员
         /// </summary>
         public string kdhy { get; set; }
-        
+
         /// <summary>
         /// 开单会员名称
         /// </summary>
         public string kdhyc { get; set; }
-        
+
         /// <summary>
         /// 开单会员手机号
         /// </summary>
         public string kdhysjh { get; set; }
-        
+
         /// <summary>
         /// 健康师业绩
         /// </summary>
         public string jksyj { get; set; }
-        
+
         /// <summary>
         /// 科技部老师业绩
         /// </summary>
         public string kjblsyj { get; set; }
-        
+
         /// <summary>
         /// 品项信息
         /// </summary>
         public string pxxx { get; set; }
-        
+
         /// <summary>
         /// 方案其他
         /// </summary>
         public string F_FIleUrl { get; set; }
-        
+
         /// <summary>
         /// 健康师业绩
         /// </summary>
         public List<LqKdJksyjInfoOutput> lqKdJksyjList { get; set; }
-        
+
         /// <summary>
         /// 科技部老师业绩
         /// </summary>
         public List<LqKdKjbsyjInfoOutput> lqKdKjbsyjList { get; set; }
-        
+
         /// <summary>
         /// 开单_品项明细
         /// </summary>
         public List<LqKdPxmxInfoOutput> lqKdPxmxList { get; set; }
-        
+
     }
 }
@@ -121,6 +121,11 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public string mrs { get; set; }
         /// <summary>
+        /// 美容师名称
+        /// </summary>
+        public string mrsName { get; set; }
+
+        /// <summary>
         /// 进店渠道
         /// </summary>
         public string jdqd { get; set; }
@@ -396,7 +396,7 @@ namespace NCC.Extend.LqKdKdjlb
                     var entityInfo = await GetInfo(newEntity.Id);
                     if (entityInfo != null)
                     {
-                        var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo);
+                        var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo, HealthInstructorNames);
                         Console.WriteLine("开单记录字符串生成成功:");
                         Console.WriteLine(orderRecordString);
@@ -29,6 +29,7 @@ using NCC.Extend.Entitys.lq_mdxx;
 using NCC.Extend.Entitys.lq_xh_hyhk;
 using NCC.Extend.Entitys.lq_xh_pxmx;
 using NCC.Extend.Interfaces.LqKhxx;
+using NCC.System.Entitys.Permission;
 using NCC.FriendlyException;
 using NCC.JsonSerialization;
 using SqlSugar;
@@ -126,6 +127,7 @@ namespace NCC.Extend.LqKhxx
                     tjr = it.Tjr,
                     fzgw = it.Fzgw,
                     mrs = it.Mrs,
+                    mrsName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Mrs).Select(u => u.RealName),
                     jdqd = it.Jdqd,
                     lxdz = it.Lxdz,
                     bz = it.Bz,
@@ -186,6 +186,13 @@ namespace NCC.Extend.LqTkjlb
                 MemberInfo.Sjh = input.customerPhone; // 设置手机号
                 MemberInfo.Khlx = MemberTypeEnum.线索.GetHashCode().ToString();
                 MemberInfo.Dah = "GK" + DateTime.Now.ToString("yyyyMMddHHmmss");
+                //找到input.expansionUserId的用户信息
+                var userInfo = await _db.Queryable<UserEntity>().Where(u => u.Id == input.expansionUserId).FirstAsync();
+                //判断 岗位是否为健康师，如果是健康师，则设置健康师为负责人
+                if (userInfo.Gw == "健康师")
+                {
+                    MemberInfo.Mrs = input.expansionUserId;
+                }
                 MemberInfo.Gsmd = eventUserInfo.StoreId;
                 var memberResult = await _db.Insertable(MemberInfo).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
                 if (!(memberResult > 0))
@@ -27,8 +27,9 @@ namespace NCC.Extend.Utils
         /// 生成开单记录字符串
         /// </summary>
         /// <param name="entity">开单记录实体</param>
+        /// <param name="HealthInstructorNames">健康师姓名</param>
         /// <returns>格式化的字符串</returns>
-        public string GenerateOrderRecordString(LqKdKdjlbInfoOutput entity)
+        public string GenerateOrderRecordString(LqKdKdjlbInfoOutput entity, string HealthInstructorNames)
         {
             if (entity == null)
             {
@@ -45,7 +46,7 @@ namespace NCC.Extend.Utils
             var customerName = GetCustomerName(entity.kdhy);
             sb.AppendLine($"⏩顾客姓名：{customerName}");
             // 健康师：王维
-            var healthTeachers = GetHealthTeachers(entity.lqKdJksyjList);
+            var healthTeachers = HealthInstructorNames.TrimEnd(',');
             sb.AppendLine($"⏩健康师：{healthTeachers}");
             // 活动方案：532工程
@@ -94,7 +94,7 @@ namespace NCC.Extend.Utils
                 }
             };
-            return _stringGenerator.GenerateOrderRecordString(testEntity);
+            return _stringGenerator.GenerateOrderRecordString(testEntity, "测试健康师1,测试健康师2");
         }
     }
 }