Merge branch 'master' of http://39.98.150.180/antissoft/lvqianmeiye_ERP

李宇
2 parents 384a1e80 db3fff3e
Showing 4 changed files with 17 additions and 35 deletions
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs
创建考勤汇总表.sql
@@ -122,10 +122,15 @@ namespace NCC.Extend.LqKdKdjlb
                 }
                 var output = entity.Adapt<LqKdKdjlbInfoOutput>();
+                if (output.activityId != null)
+                {
+                    output.activityName = await _db.Queryable<LqPackageInfoEntity>().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync();
+                }
                 //获取会员信息
                 var MemberInfo = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == entity.Kdhy);
                 output.kdhyc = MemberInfo.Khmc;
                 output.kdhysjh = MemberInfo.Sjh;
+
                 if (!string.IsNullOrEmpty(entity.ActivityId))
                 {
                     output.activityName = await _db.Queryable<LqPackageInfoEntity>().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync();
@@ -2081,10 +2086,7 @@ namespace NCC.Extend.LqKdKdjlb
                 // 查询开单记录
                 var billingRecords = await _db.Queryable<LqKdKdjlbEntity>()
-                    .Where(w => w.Djmd == input.StoreId
-                        && w.Kdrq >= input.StartTime
-                        && w.Kdrq <= input.EndTime
-                        && w.IsEffective == StatusEnum.有效.GetHashCode())
+                    .Where(w => w.Djmd == input.StoreId && w.Kdrq >= input.StartTime && w.Kdrq <= input.EndTime && w.IsEffective == StatusEnum.有效.GetHashCode())
                     .Select(it => new
                     {
                         id = it.Id,
@@ -2095,8 +2097,8 @@ namespace NCC.Extend.LqKdKdjlb
                         zdyj = it.Zdyj,
                         sfyj = it.Sfyj,
                         qk = it.Qk,
-                        kdhyc = it.Kdhyc,
-                        kdhysjh = it.Kdhysjh,
+                        kdhyc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc),
+                        kdhysjh = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh),
                         fkfs = it.Fkfs, // 付款方式
                         khly = it.Khly, // 客户来源
                         bz = it.Bz, // 备注
@@ -820,7 +820,7 @@ namespace NCC.Extend.LqTkjlb
                     -- 邀约信息
                     yaoy.F_Id as yaoy_id,                                 -- 邀约ID
                     yaoy.F_CreateTime as yaoy_time,                        -- 邀约时间
-                    yaoy.F_Status as yaoy_status,                         -- 邀约状态
+                    yaoy.yysj as yaoy_appointment_time,                    -- 邀约时间
                     -- 预约信息
                     yy.F_Id as yy_id,                                     -- 预约ID
                     yy.F_Status as yy_status,                            -- 预约状态
@@ -862,10 +862,10 @@ namespace NCC.Extend.LqTkjlb
                 LEFT JOIN (
                     SELECT 
                         hy as member_id,
-                        SUM(xfje) as total_consume_amount,
+                        SUM(COALESCE(xfje, 0)) as total_consume_amount,
                         COUNT(*) as consume_count,
-                        MIN(F_CreateTime) as first_consume_time,
-                        MAX(F_CreateTime) as last_consume_time
+                        MIN(hksj) as first_consume_time,
+                        MAX(hksj) as last_consume_time
                     FROM lq_xh_hyhk 
                     WHERE F_IsEffective = 1
                     GROUP BY hy
@@ -873,11 +873,11 @@ namespace NCC.Extend.LqTkjlb
                 LEFT JOIN (
                     SELECT 
                         kdhy as member_id,
-                        SUM(sfyj) as total_billing_amount,
-                        SUM(qk) as total_debt_amount,
+                        SUM(COALESCE(sfyj, 0)) as total_billing_amount,
+                        SUM(COALESCE(qk, 0)) as total_debt_amount,
                         COUNT(*) as billing_count,
-                        MIN(F_CreateTime) as first_billing_time,
-                        MAX(F_CreateTime) as last_billing_time
+                        MIN(kdrq) as first_billing_time,
+                        MAX(kdrq) as last_billing_time
                     FROM lq_kd_kdjlb 
                     WHERE F_IsEffective = 1
                     GROUP BY kdhy
@@ -51,6 +51,7 @@ namespace NCC.Extend.Utils
             sb.AppendLine($"⏩健康师：{string.Join("、", healthTeachers)}");
             // 活动方案：532工程
+            sb.AppendLine($"⏩活动方案：{entity.activityName ?? "无"}");
             // sb.AppendLine($"⏩活动方案：{entity.pxxx ?? "无"}");
             // 跟单配合：王经理 竹主任 陈思思老师
             var techTeachers = GetTechTeachers(entity.lqKdKjbsyjList);
-CREATE TABLE `lq_attendance_summary` (
-  `F_Id` varchar(50) NOT NULL COMMENT '考勤汇总ID',
-  `F_UserId` varchar(50) NOT NULL COMMENT '用户ID（员工ID）',
-  `F_Year` int NOT NULL COMMENT '年份',
-  `F_Month` int NOT NULL COMMENT '月份',
-  `F_EmployeeStatus` int NOT NULL DEFAULT 1 COMMENT '员工状态（1-在职，2-离职，3-停薪留职）',
-  `F_WorkDays` decimal(5,2) NOT NULL DEFAULT 0.00 COMMENT '出勤天数',
-  `F_LeaveDays` decimal(5,2) NOT NULL DEFAULT 0.00 COMMENT '请假天数',
-  `F_RestDays` decimal(5,2) NOT NULL DEFAULT 0.00 COMMENT '休息天数',
-  `F_Remark`  varchar(2000)  COMMENT '备注',
-  `F_CreateUser` varchar(50) NOT NULL COMMENT '创建人ID',
-  `F_CreateTime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `F_UpdateUser` varchar(50) COMMENT '更新人ID',
-  `F_UpdateTime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-  `F_IsEffective` int NOT NULL DEFAULT 1 COMMENT '是否有效（1-有效，-1-无效）',
-  PRIMARY KEY (`F_Id`),
-  UNIQUE KEY `uk_user_year_month` (`F_UserId`, `F_Year`, `F_Month`),
-  KEY `idx_user_id` (`F_UserId`),
-  KEY `idx_year_month` (`F_Year`, `F_Month`),
-  KEY `idx_create_time` (`F_CreateTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='考勤汇总表';