From 50867d2a2feee3c5ed7a8c08f87202821959260f Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Wed, 14 Jan 2026 15:47:15 +0800
Subject: [PATCH] 更新消耗相关服务和DTO

---
 antis-ncc-admin/.env.development                                                             |  4 ++--
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/ConsumeItemDetailListOutput.cs |  7 +++++++
 netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs                                  | 39 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development
index 198955a..6462393 100644
--- a/antis-ncc-admin/.env.development
+++ b/antis-ncc-admin/.env.development
@@ -2,8 +2,8 @@
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com'
-VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
-# VUE_APP_BASE_API = 'http://localhost:2011'
+# VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
+VUE_APP_BASE_API = 'http://localhost:2011'
 # VUE_APP_BASE_API = 'http://localhost:2011'
 VUE_APP_IMG_API = ''
 VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket'
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/ConsumeItemDetailListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/ConsumeItemDetailListOutput.cs
index 0a15b43..1c3e1e5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/ConsumeItemDetailListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/ConsumeItemDetailListOutput.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using NCC.Extend.Entitys.Dto.LqXhJksyj;
 
 namespace NCC.Extend.Entitys.Dto.LqXhPxmx
 {
@@ -76,6 +78,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhPxmx
         /// 门店名称
         /// </summary>
         public string storeName { get; set; }
+
+        /// <summary>
+        /// 健康师业绩列表
+        /// </summary>
+        public List<LqXhJksyjInfoOutput> lqXhJksyjList { get; set; }
     }
 }
 
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
index b4dc49a..88cebc5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
@@ -1983,6 +1983,7 @@ namespace NCC.Extend.LqXhHyhk
         /// - sourceType: 来源类型（字符串，如：购买、赠送、体验）
         /// - storeId: 门店ID（关联耗卡记录表的门店ID）
         /// - storeName: 门店名称（关联门店表的店名字段）
+        /// - lqXhJksyjList: 健康师业绩列表（关联健康师业绩表，通过F_kdpxid关联品项明细ID）
         /// </remarks>
         /// <param name="input">查询参数</param>
         /// <returns>耗卡品项明细记录列表（分页）</returns>
@@ -2094,6 +2095,41 @@ namespace NCC.Extend.LqXhHyhk
                     storeDict = stores.ToDictionary(x => x.Id, x => x.Dm ?? "");
                 }
 
+                // 批量查询健康师业绩信息（通过 F_kdpxid 关联到品项明细ID）
+                var jksyjDict = new Dictionary<string, List<LqXhJksyjInfoOutput>>();
+                if (itemIds.Any())
+                {
+                    var jksyjEntities = await _db.Queryable<LqXhJksyjEntity>()
+                        .Where(x => itemIds.Contains(x.Kdpxid) && x.IsEffective == StatusEnum.有效.GetHashCode())
+                        .ToListAsync();
+                    
+                    var jksyjList = jksyjEntities.Select(x => new LqXhJksyjInfoOutput
+                    {
+                        id = x.Id,
+                        glkdbh = x.Glkdbh,
+                        jks = x.Jks,
+                        jksxm = x.Jksxm,
+                        jkszh = x.Jkszh,
+                        jksyj = x.Jksyj?.ToString() ?? "0",
+                        yjsj = x.Yjsj,
+                        jsjId = x.JsjId,
+                        kdpxid = x.Kdpxid,
+                        laborCost = x.LaborCost,
+                        kdpxNumber = x.KdpxNumber,
+                        originalKdpxNumber = x.OriginalKdpxNumber,
+                        overtimeKdpxNumber = x.OvertimeKdpxNumber,
+                        originalLaborCost = x.OriginalLaborCost,
+                        overtimeLaborCost = x.OvertimeLaborCost,
+                        isAccompanied = x.IsAccompanied,
+                        accompaniedProjectNumber = x.AccompaniedProjectNumber
+                    }).ToList();
+                    
+                    jksyjDict = jksyjList
+                        .Where(x => !string.IsNullOrEmpty(x.kdpxid))
+                        .GroupBy(x => x.kdpxid)
+                        .ToDictionary(g => g.Key, g => g.ToList());
+                }
+
                 // 5. 组装返回数据
                 var resultList = pagedData.list.Select(pxmx => new ConsumeItemDetailListOutput
                 {
@@ -2110,7 +2146,8 @@ namespace NCC.Extend.LqXhHyhk
                     totalPrice = pxmx.TotalPrice,
                     sourceType = pxmx.SourceType,
                     storeId = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) ? consumeDict[pxmx.ConsumeInfoId].StoreId : "",
-                    storeName = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) && !string.IsNullOrEmpty(consumeDict[pxmx.ConsumeInfoId].StoreId) && storeDict.ContainsKey(consumeDict[pxmx.ConsumeInfoId].StoreId) ? storeDict[consumeDict[pxmx.ConsumeInfoId].StoreId] : ""
+                    storeName = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) && !string.IsNullOrEmpty(consumeDict[pxmx.ConsumeInfoId].StoreId) && storeDict.ContainsKey(consumeDict[pxmx.ConsumeInfoId].StoreId) ? storeDict[consumeDict[pxmx.ConsumeInfoId].StoreId] : "",
+                    lqXhJksyjList = jksyjDict.ContainsKey(pxmx.Id) ? jksyjDict[pxmx.Id] : new List<LqXhJksyjInfoOutput>()
                 }).ToList();
 
                 // 6. 返回分页结果
--
libgit2 0.21.4