1111

“wangming”
1 parent 47d33dca
Showing 2 changed files with 23 additions and 19 deletions
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs
@@ -254,6 +254,7 @@ namespace NCC.Extend.LqKdKdjlb
         {
             var userInfo = await _userManager.GetUserInfo();
             var entity = input.Adapt<LqKdKdjlbEntity>();
+            var HealthInstructorNames = "";
             entity.Id = YitIdHelper.NextId().ToString();
             entity.CreateTime = DateTime.Now;
             entity.UpdateTime = DateTime.Now;
@@ -309,22 +310,22 @@ namespace NCC.Extend.LqKdKdjlb
                     // 收集该品项关联的健康师业绩
                     if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
                     {
+                        //把jksxm保存到HealthInstructorNames
                         foreach (var ijks_tem in item.lqKdJksyjList)
                         {
-                            allJksyjEntities.Add(
-                                new LqKdJksyjEntity
-                                {
-                                    Id = YitIdHelper.NextId().ToString(),
-                                    Glkdbh = newEntity.Id,
-                                    Jks = ijks_tem.jks,
-                                    Jksxm = ijks_tem.jksxm,
-                                    Jkszh = ijks_tem.jkszh,
-                                    Jksyj = ijks_tem.jksyj,
-                                    Yjsj = input.kdrq,
-                                    Jsj_id = ijks_tem.jsj_id,
-                                    Kdpxid = lqKdPxmxEntity.Id,
-                                }
-                            );
+                            HealthInstructorNames += ijks_tem.jksxm + ",";
+                            allJksyjEntities.Add(new LqKdJksyjEntity
+                            {
+                                Id = YitIdHelper.NextId().ToString(),
+                                Glkdbh = newEntity.Id,
+                                Jks = ijks_tem.jks,
+                                Jksxm = ijks_tem.jksxm,
+                                Jkszh = ijks_tem.jkszh,
+                                Jksyj = ijks_tem.jksyj,
+                                Yjsj = input.kdrq,
+                                Jsj_id = ijks_tem.jsj_id,
+                                Kdpxid = lqKdPxmxEntity.Id,
+                            });
                         }
                     }
  
@@ -349,6 +350,13 @@ namespace NCC.Extend.LqKdKdjlb
                         }
                     }
                 }
+
+                // 处理健康师姓名，去除最后的逗号并赋值给实体
+                if (!string.IsNullOrEmpty(HealthInstructorNames))
+                {
+                    HealthInstructorNames = HealthInstructorNames.TrimEnd(',');
+                }
+
                 //通过会员id查询会员信息
                 var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(u => u.Id == entity.Kdhy).FirstAsync();
                 //通过开单记录表查询这个会员开单金额
@@ -236,13 +236,9 @@ namespace NCC.Extend.Utils
             {
                 return string.Empty;
             }
-
             try
             {
-                var user = _db.Queryable<UserEntity>()
-                    .Where(x => x.Account == account && x.DeleteMark == null)
-                    .First();
-
+                var user = _db.Queryable<UserEntity>().Where(x => x.Id == account && x.DeleteMark == null).First();
                 return user?.RealName ?? string.Empty;
             }
             catch