From 11b81187f08d8f74392574e06d24dd7e77a61d59 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Wed, 12 Nov 2025 12:07:12 +0800 Subject: [PATCH] feat: 优化业绩统计逻辑,按部门ID去重累加完成业绩;添加事业部名称排序功能;更新门店品项统计返回结构,支持层级展示 --- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqPackageInfo/ActivityStatisticsByStoreItemOutput.cs | 19 +++++++++++++++---- netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------ netcore/src/Modularity/Extend/NCC.Extend/LqPackageInfoService.cs | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs | 75 ++++++++++++++++++++++++++++++++++++++++++++++----------------------------- netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs | 7 +++++++ 5 files changed, 257 insertions(+), 95 deletions(-) diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqPackageInfo/ActivityStatisticsByStoreItemOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqPackageInfo/ActivityStatisticsByStoreItemOutput.cs index 3f75828..abb9115 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqPackageInfo/ActivityStatisticsByStoreItemOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqPackageInfo/ActivityStatisticsByStoreItemOutput.cs @@ -18,15 +18,15 @@ namespace NCC.Extend.Entitys.Dto.LqPackageInfo public string ActivityName { get; set; } /// - /// 门店品项统计列表 + /// 门店统计列表(层级结构:每个门店下包含品项列表) /// - public List StoreItemList { get; set; } + public List StoreList { get; set; } } /// - /// 门店品项统计项 + /// 门店统计(包含品项列表) /// - public class StoreItemStatisticsItem + public class StoreStatisticsWithItems { /// /// 门店ID @@ -39,6 +39,17 @@ namespace NCC.Extend.Entitys.Dto.LqPackageInfo public string StoreName { get; set; } /// + /// 该门店下的品项统计列表 + /// + public List ItemList { get; set; } + } + + /// + /// 门店品项统计项 + /// + public class StoreItemStatisticsItem + { + /// /// 品项ID /// public string ItemId { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs index fa274d2..5cdabf5 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs @@ -13,6 +13,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; using Yitter.IdGenerator; using NCC.Common.Helper; @@ -529,48 +530,39 @@ namespace NCC.Extend return new List(); } - // 第二步:统计各天王团的完成业绩(分类型统计) - var completedPerformanceDataList = new List(); + // 第二步:统计各天王团的完成业绩(直接按部门ID统计,避免重复计算) + var deptIdsStrForQuery = string.Join("','", departmentDict.Keys); - foreach (var deptType in tianwangDepartments) - { - var deptIdsStrForQuery = string.Join("','", departmentDict.Keys); - - var completedPerformanceSql = $@" - SELECT - o.F_Id as DepartmentId, - COALESCE(SUM(billing.sfyj), 0) as CompletedPerformance - FROM lq_kd_kdjlb billing - INNER JOIN lq_mdxx store ON billing.djmd = store.F_Id - INNER JOIN base_organize o ON store.{deptType.Key} = o.F_Id - WHERE billing.F_IsEffective = 1 - AND o.F_Category = 'department' - AND (o.F_DeleteMark IS NULL OR o.F_DeleteMark != 1) - AND DATE(billing.kdrq) >= '{startDate:yyyy-MM-dd}' - AND DATE(billing.kdrq) <= '{endDate:yyyy-MM-dd}' - AND o.F_Id IN ('{deptIdsStrForQuery}') - GROUP BY o.F_Id"; + // 使用 OR 条件连接三个部门类型字段,确保每个开单记录只被统计一次到对应的部门 + var completedPerformanceSql = $@" + SELECT + o.F_Id as DepartmentId, + COALESCE(SUM(billing.sfyj), 0) as CompletedPerformance + FROM lq_kd_kdjlb billing + INNER JOIN lq_mdxx store ON billing.djmd = store.F_Id + INNER JOIN base_organize o ON ( + (store.jyb = o.F_Id AND o.F_FullName IN ('教育一部', '教育二部')) + OR (store.kjb = o.F_Id AND o.F_FullName IN ('科技一部', '科技二部')) + OR (store.dxmb = o.F_Id AND o.F_FullName IN ('大项目一部', '大项目二部')) + ) + WHERE billing.F_IsEffective = 1 + AND o.F_Category = 'department' + AND (o.F_DeleteMark IS NULL OR o.F_DeleteMark != 1) + AND DATE(billing.kdrq) >= '{startDate:yyyy-MM-dd}' + AND DATE(billing.kdrq) <= '{endDate:yyyy-MM-dd}' + AND o.F_Id IN ('{deptIdsStrForQuery}') + GROUP BY o.F_Id"; - var completedPerformanceData = await _db.Ado.SqlQueryAsync(completedPerformanceSql); - if (completedPerformanceData != null) - { - completedPerformanceDataList.AddRange(completedPerformanceData); - } - } + var completedPerformanceData = await _db.Ado.SqlQueryAsync(completedPerformanceSql); - // 第三步:合并数据并计算完成率(按部门ID去重累加) + // 第三步:将完成业绩数据填充到部门字典中 var departmentPerformanceDict = new Dictionary(); - foreach (var item in completedPerformanceDataList) + if (completedPerformanceData != null) { - var departmentId = item.DepartmentId.ToString(); - var completedPerformance = Convert.ToDecimal(item.CompletedPerformance); - - if (departmentPerformanceDict.ContainsKey(departmentId)) - { - departmentPerformanceDict[departmentId] += completedPerformance; - } - else + foreach (var item in completedPerformanceData) { + var departmentId = item.DepartmentId.ToString(); + var completedPerformance = Convert.ToDecimal(item.CompletedPerformance); departmentPerformanceDict[departmentId] = completedPerformance; } } @@ -1069,7 +1061,9 @@ namespace NCC.Extend }) .ToList(), }) - .OrderBy(x => x.BusinessUnitName) // 按事业部名称排序 + .ToList() + .OrderBy(x => ExtractBusinessUnitNumber(x.BusinessUnitName)) // 按事业部数字排序(事业一部、事业二部...) + .ThenBy(x => x.BusinessUnitName) // 如果数字相同,按名称排序 .ToList(); return result; @@ -1152,19 +1146,12 @@ namespace NCC.Extend // 日期(格式:11月8日) textBuilder.AppendLine($"{targetDate.Month}月{targetDate.Day}日"); - textBuilder.AppendLine(); - // 今日总业绩和总单量 textBuilder.AppendLine($"今日总业绩:{totalPerformance:F0}"); - textBuilder.AppendLine(); textBuilder.AppendLine($"今日总单量:{totalOrderCount}"); - textBuilder.AppendLine(); - // 标语 textBuilder.AppendLine("绿纤人用结果捍卫尊严 "); - textBuilder.AppendLine(); textBuilder.AppendLine("业绩捷报 "); - textBuilder.AppendLine(); // 每个事业部的数据 foreach (var unit in statistics) @@ -1175,10 +1162,7 @@ namespace NCC.Extend // 事业部业绩和单量 textBuilder.AppendLine($"{unit.BusinessUnitName}总业绩:{unit.TotalPerformance:F0}"); - textBuilder.AppendLine(); textBuilder.AppendLine($"{unit.BusinessUnitName}总单量:{unit.TotalOrderCount}"); - textBuilder.AppendLine(); - // 按门店分组订单 var ordersByStore = unit.Orders .GroupBy(x => x.StoreName) @@ -1207,7 +1191,6 @@ namespace NCC.Extend { textBuilder.AppendLine($"第{orderIndex}单:{order.StoreName}{teacherNames}{order.Amount:F0}"); } - textBuilder.AppendLine(); orderIndex++; } } @@ -1220,6 +1203,84 @@ namespace NCC.Extend throw NCCException.Oh($"获取事业部开单统计文本失败: {ex.Message}", ex); } } + + /// + /// 从事业部名称中提取数字(用于排序) + /// 例如:"事业一部" -> 1, "事业二部" -> 2, "事业三部" -> 3 + /// + /// 事业部名称 + /// 提取的数字,如果提取失败返回999(排在最后) + private int ExtractBusinessUnitNumber(string businessUnitName) + { + if (string.IsNullOrEmpty(businessUnitName)) + { + return 999; + } + + // 使用正则表达式提取数字 + var match = Regex.Match(businessUnitName, @"[一二三四五六七八九十]+|[\d]+"); + if (match.Success) + { + var numberStr = match.Value; + + // 如果是中文数字,转换为阿拉伯数字 + if (Regex.IsMatch(numberStr, @"[一二三四五六七八九十]+")) + { + var chineseNumbers = new Dictionary + { + { "一", 1 }, { "二", 2 }, { "三", 3 }, { "四", 4 }, { "五", 5 }, + { "六", 6 }, { "七", 7 }, { "八", 8 }, { "九", 9 }, { "十", 10 } + }; + + // 处理"十"的情况(如"十一"、"十二"等) + if (numberStr == "十") + { + return 10; + } + else if (numberStr.StartsWith("十")) + { + // 十一、十二...十九 + var remainder = numberStr.Substring(1); + if (chineseNumbers.ContainsKey(remainder)) + { + return 10 + chineseNumbers[remainder]; + } + } + else if (numberStr.EndsWith("十")) + { + // 二十、三十...九十 + var prefix = numberStr.Substring(0, numberStr.Length - 1); + if (chineseNumbers.ContainsKey(prefix)) + { + return chineseNumbers[prefix] * 10; + } + } + else if (numberStr.Length == 2 && numberStr.Contains("十")) + { + // 二十一、二十二...九十九 + var parts = numberStr.Split('十'); + if (parts.Length == 2) + { + var tens = parts[0] == "" ? 1 : (chineseNumbers.ContainsKey(parts[0]) ? chineseNumbers[parts[0]] : 0); + var ones = parts[1] == "" ? 0 : (chineseNumbers.ContainsKey(parts[1]) ? chineseNumbers[parts[1]] : 0); + return tens * 10 + ones; + } + } + else if (chineseNumbers.ContainsKey(numberStr)) + { + return chineseNumbers[numberStr]; + } + } + else if (int.TryParse(numberStr, out var number)) + { + // 如果是阿拉伯数字,直接返回 + return number; + } + } + + // 如果提取失败,返回999(排在最后) + return 999; + } #endregion diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqPackageInfoService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqPackageInfoService.cs index eb6bc42..59d0fa8 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqPackageInfoService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqPackageInfoService.cs @@ -901,6 +901,7 @@ namespace NCC.Extend.LqPackageInfo } // 5. 按品项分组统计(先获取基础统计数据) + // 注意:SqlSugar 的 AggregateSum 可能不支持三元运算符,需要先查询数据再计算 var itemStatistics = await baseQuery .GroupBy((px, kd) => new { ItemId = px.Px, ItemName = px.Pxmc }) .Select((px, kd) => new @@ -908,14 +909,25 @@ namespace NCC.Extend.LqPackageInfo ItemId = px.Px ?? "", ItemName = px.Pxmc ?? "", SalesQuantity = SqlFunc.AggregateSum(px.ProjectNumber), - SalesAmount = SqlFunc.AggregateSum(px.ActualPrice > 0 ? px.ActualPrice : px.TotalPrice), + SalesAmountActual = SqlFunc.AggregateSum(px.ActualPrice), + SalesAmountTotal = SqlFunc.AggregateSum(px.TotalPrice), SalesCount = SqlFunc.AggregateCount(px.Id) }) .ToListAsync(); + // 计算实际销售金额(ActualPrice > 0 时使用 ActualPrice,否则使用 TotalPrice) + var itemStatisticsWithAmount = itemStatistics.Select(stat => new + { + stat.ItemId, + stat.ItemName, + stat.SalesQuantity, + SalesAmount = stat.SalesAmountActual > 0 ? stat.SalesAmountActual : stat.SalesAmountTotal, + stat.SalesCount + }).ToList(); + // 6. 单独统计每个品项的开单数量(去重开单ID) var itemList = new List(); - foreach (var stat in itemStatistics) + foreach (var stat in itemStatisticsWithAmount) { var billingCountQuery = _db.Queryable( (px, kd) => px.Glkdbh == kd.Id) @@ -981,6 +993,20 @@ namespace NCC.Extend.LqPackageInfo /// "storeIds": ["门店ID1", "门店ID2"] /// } /// ``` + /// + /// 返回格式(层级结构): + /// - ActivityId: 营销活动ID + /// - ActivityName: 营销活动名称 + /// - StoreList: 门店统计列表 + /// - StoreId: 门店ID + /// - StoreName: 门店名称 + /// - ItemList: 该门店下的品项统计列表 + /// - ItemId: 品项ID + /// - ItemName: 品项名称 + /// - SalesQuantity: 销售数量(项目次数总和) + /// - SalesAmount: 销售金额 + /// - BillingCount: 开单数量(包含该品项的开单数) + /// - SalesCount: 销售次数(品项明细记录数) /// /// 查询参数 /// 按门店品项统计数据 @@ -1021,6 +1047,7 @@ namespace NCC.Extend.LqPackageInfo } // 5. 按门店和品项分组统计(先获取基础统计数据) + // 注意:SqlSugar 的 AggregateSum 可能不支持三元运算符,需要先查询数据再计算 var storeItemStatistics = await baseQuery .GroupBy((px, kd, md) => new { @@ -1036,14 +1063,28 @@ namespace NCC.Extend.LqPackageInfo ItemId = px.Px ?? "", ItemName = px.Pxmc ?? "", SalesQuantity = SqlFunc.AggregateSum(px.ProjectNumber), - SalesAmount = SqlFunc.AggregateSum(px.ActualPrice > 0 ? px.ActualPrice : px.TotalPrice), + SalesAmountActual = SqlFunc.AggregateSum(px.ActualPrice), + SalesAmountTotal = SqlFunc.AggregateSum(px.TotalPrice), SalesCount = SqlFunc.AggregateCount(px.Id) }) .ToListAsync(); - // 6. 单独统计每个门店品项的开单数量(去重开单ID) - var storeItemList = new List(); - foreach (var stat in storeItemStatistics) + // 计算实际销售金额(ActualPrice > 0 时使用 ActualPrice,否则使用 TotalPrice) + var storeItemStatisticsWithAmount = storeItemStatistics.Select(stat => new + { + stat.StoreId, + stat.StoreName, + stat.ItemId, + stat.ItemName, + stat.SalesQuantity, + SalesAmount = stat.SalesAmountActual > 0 ? stat.SalesAmountActual : stat.SalesAmountTotal, + stat.SalesCount + }).ToList(); + + // 6. 单独统计每个门店品项的开单数量(去重开单ID),并组装成层级结构 + var storeItemDict = new Dictionary>(); + + foreach (var stat in storeItemStatisticsWithAmount) { var billingCountQuery = _db.Queryable( (px, kd) => px.Glkdbh == kd.Id) @@ -1064,28 +1105,53 @@ namespace NCC.Extend.LqPackageInfo .Select((px, kd) => px.Glkdbh) .CountAsync(); - storeItemList.Add(new StoreItemStatisticsItem + var itemStat = new StoreItemStatisticsItem { - StoreId = stat.StoreId ?? "", - StoreName = stat.StoreName ?? "", ItemId = stat.ItemId ?? "", ItemName = stat.ItemName ?? "", SalesQuantity = stat.SalesQuantity, SalesAmount = stat.SalesAmount, BillingCount = billingCount, SalesCount = stat.SalesCount - }); + }; + + // 按门店分组 + var storeKey = stat.StoreId ?? ""; + if (!storeItemDict.ContainsKey(storeKey)) + { + storeItemDict[storeKey] = new List(); + } + storeItemDict[storeKey].Add(itemStat); } - // 7. 排序 - storeItemList = storeItemList.OrderBy(x => x.StoreName).ThenBy(x => x.ItemName).ToList(); + // 7. 组装层级结构:门店 -> 品项列表 + var storeList = new List(); + foreach (var kvp in storeItemDict) + { + var firstItem = storeItemStatistics.FirstOrDefault(s => s.StoreId == kvp.Key); + if (firstItem != null) + { + // 对品项列表排序 + var sortedItemList = kvp.Value.OrderBy(x => x.ItemName).ToList(); - // 7. 返回统计结果 + storeList.Add(new StoreStatisticsWithItems + { + StoreId = firstItem.StoreId ?? "", + StoreName = firstItem.StoreName ?? "", + ItemList = sortedItemList + }); + } + } + + // 8. 按门店名称排序 + storeList = storeList.OrderBy(x => x.StoreName).ToList(); + + // 9. 返回统计结果 return new ActivityStatisticsByStoreItemOutput { ActivityId = input.ActivityId, ActivityName = activity.ActivityName, - StoreItemList = storeItemList + StoreList = storeList }; } catch (Exception ex) diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs index 9101b8c..ff2af33 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs @@ -1073,45 +1073,62 @@ namespace NCC.Extend.LqStatistics var startDate = new DateTime(now.Year, now.Month, 1); var endDate = startDate.AddMonths(1).AddDays(-1); - // 构建查询参数 - var parameters = new Dictionary { { "@startDate", startDate.ToString("yyyy-MM-dd 00:00:00") }, { "@endDate", endDate.ToString("yyyy-MM-dd 23:59:59") } }; + // 获取当前月份(YYYYMM格式) + var currentMonth = now.ToString("yyyyMM"); - // 查询本月全门店统计数据 - var sql = - @" + // 1. 获取本月的门店目标业绩总和(从门店目标表获取 F_StoreTarget 字段,按月份过滤) + var targetPerformanceSql = @" SELECT - SUM(target_performance) AS TotalTargetPerformance, - SUM(actual_performance) AS TotalActualPerformance, - CASE - WHEN SUM(target_performance) > 0 - THEN (SUM(actual_performance) / SUM(target_performance)) * 100 - ELSE 0 - END AS TotalCompletionRate - FROM v_store_performance_simple"; + COALESCE(SUM(F_StoreTarget), 0) AS TotalTargetPerformance + FROM lq_md_target + WHERE F_Month = @month"; - var result = await _db.Ado.SqlQueryAsync(sql, parameters); - var stats = result.FirstOrDefault(); + var targetParameters = new Dictionary + { + { "@month", currentMonth } + }; - if (stats != null) + var targetResult = await _db.Ado.SqlQueryAsync(targetPerformanceSql, targetParameters); + var targetPerformance = 0m; + if (targetResult != null && targetResult.Any()) { - var targetPerformance = Convert.ToDecimal(stats.TotalTargetPerformance ?? 0); - var actualPerformance = Convert.ToDecimal(stats.TotalActualPerformance ?? 0); - var completionRate = Convert.ToDecimal(stats.TotalCompletionRate ?? 0); + targetPerformance = Convert.ToDecimal(targetResult.FirstOrDefault()?.TotalTargetPerformance ?? 0); + } - return new - { - TargetPerformance = targetPerformance, - ActualPerformance = actualPerformance, - CompletionRate = completionRate, - Month = now.ToString("yyyy年MM月"), - }; + // 2. 从开单记录表获取本月实付金额的总和(sfyj 字段) + var actualPerformanceSql = @" + SELECT + COALESCE(SUM(sfyj), 0) AS TotalActualPerformance + FROM lq_kd_kdjlb + WHERE F_IsEffective = 1 + AND kdrq >= @startDate + AND kdrq <= @endDate"; + + var parameters = new Dictionary + { + { "@startDate", startDate.ToString("yyyy-MM-dd 00:00:00") }, + { "@endDate", endDate.ToString("yyyy-MM-dd 23:59:59") } + }; + + var actualResult = await _db.Ado.SqlQueryAsync(actualPerformanceSql, parameters); + var actualPerformance = 0m; + if (actualResult != null && actualResult.Any()) + { + actualPerformance = Convert.ToDecimal(actualResult.FirstOrDefault()?.TotalActualPerformance ?? 0); + } + + // 3. 计算完成率 + var completionRate = 0m; + if (targetPerformance > 0) + { + completionRate = (actualPerformance / targetPerformance) * 100m; } return new { - TargetPerformance = 0m, - ActualPerformance = 0m, - CompletionRate = 0m, + TargetPerformance = targetPerformance, + ActualPerformance = actualPerformance, + CompletionRate = decimal.Round(completionRate, 2), Month = now.ToString("yyyy年MM月"), }; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs index 63bccf5..dac043f 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs @@ -964,6 +964,13 @@ namespace NCC.Extend.LqXhHyhk { // 开启事务 _db.BeginTran(); + // 查询会员信息 + var memberInfo = await _db.Queryable().Where(w => w.Id == entity.Hy).FirstAsync(); + //如果会员类型是线索,那么就更新为新客 + if (memberInfo.Khlx == MemberTypeEnum.线索.GetHashCode().ToString()) + { + memberInfo.Khlx = MemberTypeEnum.新客.GetHashCode().ToString(); + } // 新增会员耗卡记录 var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync(); // 收集所有需要插入的实体,然后批量插入 -- libgit2 0.21.4