d98270e2
“wangming”
Enhance LqEventSe...
|
1
2
3
4
5
6
7
8
9
10
|
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using NCC.ClayObject;
using NCC.Common.Configuration;
using NCC.Common.Core.Manager;
|
96009bc9
hexiaodong
hxd
|
11
12
13
|
using NCC.Common.Enum;
using NCC.Common.Extension;
using NCC.Common.Filter;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
14
15
16
|
using NCC.Common.Helper;
using NCC.Common.Model.NPOI;
using NCC.DataEncryption;
|
96009bc9
hexiaodong
hxd
|
17
18
|
using NCC.Dependency;
using NCC.DynamicApiController;
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
19
|
using NCC.Extend.Entitys.Dto.LqPersonTimesRecord;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
20
|
using NCC.Extend.Entitys.Dto.LqXhHyhk;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
21
22
23
|
using NCC.Extend.Entitys.Dto.LqXhJksyj;
using NCC.Extend.Entitys.Dto.LqXhKjbsyj;
using NCC.Extend.Entitys.Dto.LqXhPxmx;
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
24
|
using NCC.Extend.Entitys.Dto.LqYyjl;
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
25
|
using NCC.Extend.Entitys.Enum;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
26
27
28
|
using NCC.Extend.Entitys.lq_kd_kdjlb;
using NCC.Extend.Entitys.lq_kd_pxmx;
using NCC.Extend.Entitys.lq_khxx;
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
29
|
using NCC.Extend.Entitys.lq_person_times_record;
|
efde7d04
“wangming”
更新多个文件,删除不再使用的CSS...
|
30
31
32
33
|
using NCC.Extend.Entitys.lq_xh_hyhk;
using NCC.Extend.Entitys.lq_xh_jksyj;
using NCC.Extend.Entitys.lq_xh_kjbsyj;
using NCC.Extend.Entitys.lq_xh_pxmx;
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
34
|
using NCC.Extend.Entitys.lq_xmzl;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
35
36
|
using NCC.Extend.Interfaces.LqXhHyhk;
using NCC.FriendlyException;
|
96009bc9
hexiaodong
hxd
|
37
|
using NCC.JsonSerialization;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
38
39
|
using SqlSugar;
using Yitter.IdGenerator;
|
96009bc9
hexiaodong
hxd
|
40
41
42
43
|
namespace NCC.Extend.LqXhHyhk
{
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
44
|
/// 耗卡记录表服务
|
96009bc9
hexiaodong
hxd
|
45
|
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
46
|
[ApiDescriptionSettings(Tag = "绿纤耗卡记录表服务", Name = "LqXhHyhk", Order = 200, Groups = new[] { "Default" })]
|
96009bc9
hexiaodong
hxd
|
47
48
49
50
51
52
53
54
55
|
[Route("api/Extend/[controller]")]
public class LqXhHyhkService : ILqXhHyhkService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<LqXhHyhkEntity> _lqXhHyhkRepository;
private readonly ISqlSugarRepository<LqXhJksyjEntity> _lqXhJksyjRepository;
private readonly ISqlSugarRepository<LqXhKjbsyjEntity> _lqXhKjbsyjRepository;
private readonly ISqlSugarRepository<LqXhPxmxEntity> _lqXhPxmxRepository;
private readonly SqlSugarScope _db;
private readonly IUserManager _userManager;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
56
|
private readonly ILogger<LqXhHyhkService> _logger;
|
96009bc9
hexiaodong
hxd
|
57
58
59
60
61
62
63
64
65
|
/// <summary>
/// 初始化一个<see cref="LqXhHyhkService"/>类型的新实例
/// </summary>
public LqXhHyhkService(
ISqlSugarRepository<LqXhHyhkEntity> lqXhHyhkRepository,
ISqlSugarRepository<LqXhJksyjEntity> lqXhJksyjRepository,
ISqlSugarRepository<LqXhKjbsyjEntity> lqXhKjbsyjRepository,
ISqlSugarRepository<LqXhPxmxEntity> lqXhPxmxRepository,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
66
|
IUserManager userManager,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
67
68
|
ILogger<LqXhHyhkService> logger
)
|
96009bc9
hexiaodong
hxd
|
69
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
70
|
_lqXhHyhkRepository = lqXhHyhkRepository;
|
96009bc9
hexiaodong
hxd
|
71
72
73
74
75
|
_db = _lqXhHyhkRepository.Context;
_lqXhJksyjRepository = lqXhJksyjRepository;
_lqXhKjbsyjRepository = lqXhKjbsyjRepository;
_lqXhPxmxRepository = lqXhPxmxRepository;
_userManager = userManager;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
76
|
_logger = logger;
|
96009bc9
hexiaodong
hxd
|
77
78
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
79
|
#region 获取会员耗卡
|
96009bc9
hexiaodong
hxd
|
80
81
82
|
/// <summary>
/// 获取会员耗卡
/// </summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
83
84
85
|
/// <remarks>
/// 获取耗卡记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
/// 按照耗卡的完整格式返回数据,不包含汇总信息
|
d98270e2
“wangming”
Enhance LqEventSe...
|
86
|
///
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
87
88
89
90
91
92
93
94
95
96
97
|
/// 返回数据结构:
/// - 主表信息:耗卡基础信息、门店信息、会员信息等
/// - 品项明细列表:每个品项包含完整的项目信息(项目次数、是否有效、来源类型等)
/// - 健康师业绩列表:按品项关联的健康师业绩信息
/// - 科技部老师业绩列表:按品项关联的科技部老师业绩信息
/// </remarks>
/// <param name="id">耗卡记录主键ID</param>
/// <returns>耗卡记录完整信息</returns>
/// <response code="200">查询成功</response>
/// <response code="404">耗卡记录不存在</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
98
99
100
|
[HttpGet("{id}")]
public async Task<dynamic> GetInfo(string id)
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
101
102
103
104
105
106
107
108
109
110
|
try
{
// 1. 查询主表信息
var entity = await _db.Queryable<LqXhHyhkEntity>().FirstAsync(p => p.Id == id);
if (entity == null)
{
throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在");
}
var output = entity.Adapt<LqXhHyhkInfoOutput>();
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
111
112
113
114
|
//获取会员信息
var MemberInfo = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == entity.Hy);
output.hymc = MemberInfo.Khmc;
output.memberPhone = MemberInfo.Sjh;
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
115
116
|
// 2. 查询品项明细列表
|
b45d55f7
“wangming”
Refactor LqEventS...
|
117
|
var lqXhPxmxList = await _db.Queryable<LqXhPxmxEntity>().Where(w => w.ConsumeInfoId == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
118
|
// 3. 查询健康师业绩列表
|
d98270e2
“wangming”
Enhance LqEventSe...
|
119
|
var lqXhJksyjList = await _db.Queryable<LqXhJksyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
120
|
// 4. 查询科技部老师业绩列表
|
d98270e2
“wangming”
Enhance LqEventSe...
|
121
|
var lqXhKjbsyjList = await _db.Queryable<LqXhKjbsyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
122
123
|
// 获取人次记录列表
var personTimesRecordList = await _db.Queryable<LqPersonTimesRecordEntity>().Where(x => x.BusinessId == entity.Id && x.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
124
125
126
127
128
129
130
|
// 5. 构建品项明细输出,每个品项关联对应的业绩信息
var pxmxOutputList = new List<LqXhPxmxInfoOutput>();
foreach (var pxmx in lqXhPxmxList)
{
var pxmxOutput = new LqXhPxmxInfoOutput
{
id = pxmx.Id,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
131
132
|
consumeInfoId = pxmx.ConsumeInfoId,
billingItemId = pxmx.BillingItemId,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
133
134
135
|
px = pxmx.Px,
pxmc = pxmx.Pxmc,
pxjg = pxmx.Pxjg,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
136
137
138
|
memberId = pxmx.MemberId,
createTime = pxmx.CreateTIme,
projectNumber = pxmx.ProjectNumber,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
139
|
sourceType = pxmx.SourceType,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
140
|
totalPrice = pxmx.TotalPrice,
|
d7925aaa
“wangming”
星期五了,下班咯
|
141
|
isEffective = pxmx.IsEffective,
|
e09804e2
“wangming”
fix: 更新消耗服务相关代码
|
142
143
|
originalProjectNumber = pxmx.OriginalProjectNumber,
overtimeProjectNumber = pxmx.OvertimeProjectNumber
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
144
145
146
147
148
149
150
151
152
153
154
155
|
};
// 关联该品项的健康师业绩
var jksyjForPx = lqXhJksyjList.Where(j => j.Kdpxid == pxmx.Id).ToList();
pxmxOutput.lqXhJksyjList = jksyjForPx.Adapt<List<LqXhJksyjInfoOutput>>();
// 关联该品项的科技部老师业绩
var kjbsyjForPx = lqXhKjbsyjList.Where(k => k.Hkpxid == pxmx.Id).ToList();
pxmxOutput.lqXhKjbsyjList = kjbsyjForPx.Adapt<List<LqXhKjbsyjInfoOutput>>();
pxmxOutputList.Add(pxmxOutput);
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
156
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
157
158
|
// 6. 设置输出结果
output.lqXhPxmxList = pxmxOutputList;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
159
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
160
161
162
|
// 7. 设置全局业绩列表(用于兼容性,但主要使用品项关联的业绩)
output.lqXhJksyjList = lqXhJksyjList.Adapt<List<LqXhJksyjInfoOutput>>();
output.lqXhKjbsyjList = lqXhKjbsyjList.Adapt<List<LqXhKjbsyjInfoOutput>>();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
163
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
164
165
166
167
168
169
170
|
return output;
}
catch (Exception ex)
{
_logger.LogError(ex, "获取耗卡记录失败,ID:{Id}", id);
throw NCCException.Oh(ErrorCode.COM1000, "获取耗卡记录失败");
}
|
96009bc9
hexiaodong
hxd
|
171
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
172
|
#endregion
|
96009bc9
hexiaodong
hxd
|
173
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
174
|
#region 获取会员耗卡列表
|
96009bc9
hexiaodong
hxd
|
175
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
176
177
|
/// 获取会员耗卡列表
/// </summary>
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
|
/// <remarks>
/// 根据多种条件查询会员耗卡记录列表,支持分页、排序、筛选等功能
///
/// 示例请求:
/// GET /api/Extend/LqXhHyhk/GetList?currentPage=1&pageSize=10&jksId=健康师ID&startTime=2025-01-01&endTime=2025-01-31
///
/// 传入参数说明:
/// - currentPage: 当前页码(必填,默认1)
/// - pageSize: 每页数量(必填,默认10)
/// - sidx: 排序字段(可选,默认"id")
/// - sort: 排序方式(可选,ASC/DESC,默认DESC)
/// - keyword: 关键字搜索(可选,搜索会员名称、账号、手机号)
/// - id: 耗卡编号(可选,模糊匹配)
/// - md: 门店ID(可选,精确匹配)
/// - mdbh: 门店编号(可选,模糊匹配)
/// - mdmc: 门店名称(可选,模糊匹配)
/// - hy: 会员ID(可选,精确匹配)
/// - hyzh: 会员账号(可选,模糊匹配)
/// - hymc: 会员名称(可选,模糊匹配)
/// - gklx: 顾客类型(可选,精确匹配)
/// - sfykjb: 是否有科技部(可选,精确匹配)
/// - hksj: 耗卡时间(可选,格式:开始时间,结束时间,如:2025-01-01,2025-01-31)
/// - czry: 操作人员ID(可选,精确匹配)
/// - isEffective: 是否有效(可选,0=全部,1=有效,2=无效,默认0)
/// - jksId: 健康师ID(可选,传入后只返回该健康师参与的耗卡记录)
/// - kjblsId: 科技部老师ID(可选,传入后只返回该老师参与的耗卡记录)
///
/// 返回结果说明:
/// - code: 响应状态码(200=成功)
/// - msg: 响应消息
/// - data: 分页数据对象
/// - list: 耗卡记录列表,每个记录包含:
/// - id: 耗卡编号
/// - md: 门店ID
/// - mdbh: 门店编号
/// - mdmc: 门店名称
/// - hy: 会员ID
/// - hyzh: 会员账号
/// - hymc: 会员名称
/// - memberPhone: 会员手机号
/// - gklx: 顾客类型
/// - xfje: 消费金额
/// - sgfy: 手工费用
/// - sfykjb: 是否有科技部
/// - hksj: 耗卡时间
/// - czry: 操作人员ID
/// - isEffective: 是否有效
/// - signatureFile: 签名文件
/// - overtimeCoefficient: 加班系数(NULL或0表示非加班单,大于0表示加班单)
/// - originalSgfy: 原始手工费(用户输入的原始值)
/// - overtimeSgfy: 加班手工费(加班计算后的增量值)
/// - ConsumeDetails: 耗卡明细列表(品项明细),每个明细包含:
/// - id: 明细编号
/// - consumeInfoId: 耗卡记录ID
/// - billingItemId: 开单品项明细表ID
/// - px: 品项编号
/// - pxmc: 品项名称
/// - pxjg: 品项价格
/// - memberId: 会员ID
/// - createTime: 创建时间
/// - projectNumber: 项目次数
/// - originalProjectNumber: 原始项目次数
/// - overtimeProjectNumber: 加班项目次数
/// - sourceType: 来源类型(开卡/赠送/其他)
/// - totalPrice: 合计金额(品项价格 × 项目次数)
/// - isEffective: 是否有效
/// - lqXhJksyjList: 健康师业绩列表,每个业绩包含:
/// - id: 业绩编号
/// - glkdbh: 关联耗卡编号
/// - jks: 健康师ID
/// - jksxm: 健康师姓名
/// - jkszh: 健康师账号
/// - jksyj: 健康师业绩
/// - yjsj: 业绩时间
/// - jsjId: 金三角ID
/// - kdpxid: 耗卡品项ID
/// - laborCost: 手工费
/// - kdpxNumber: 耗卡品项次数
/// - originalKdpxNumber: 原始耗卡品项次数
/// - overtimeKdpxNumber: 加班耗卡品项次数
/// - originalLaborCost: 原始手工费
/// - overtimeLaborCost: 加班手工费
/// - isAccompanied: 是否陪同(0=否,1=是)
/// - accompaniedProjectNumber: 陪同项目数
/// - memberId: 会员ID
/// - memberName: 会员名称
/// - lqXhKjbsyjList: 科技部老师业绩列表,每个业绩包含:
/// - id: 业绩编号
/// - glkdbh: 关联耗卡编号
/// - kjbls: 科技部老师ID
/// - kjblsxm: 科技部老师姓名
/// - kjblszh: 科技部老师账号
/// - kjblsyj: 科技部老师业绩
/// - yjsj: 业绩时间
/// - hkpxid: 耗卡品项ID
/// - laborCost: 手工费
/// - hdpxNumber: 耗卡品项次数
/// - originalHdpxNumber: 原始耗卡品项次数
/// - overtimeHdpxNumber: 加班耗卡品项次数
/// - originalLaborCost: 原始手工费
/// - overtimeLaborCost: 加班手工费
/// - pagination: 分页信息
/// - total: 总记录数
/// - pageSize: 每页数量
/// - currentPage: 当前页码
/// - totalPages: 总页数
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>分页的耗卡记录列表,包含耗卡基本信息、耗卡明细、健康师业绩、科技部老师业绩</returns>
/// <response code="200">成功返回耗卡列表</response>
/// <response code="400">参数错误</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
290
291
292
293
|
[HttpGet("")]
public async Task<dynamic> GetList([FromQuery] LqXhHyhkListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
294
295
296
297
298
299
300
301
302
303
304
|
var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
List<string> queryHksj = input.hksj != null ? input.hksj.Split(',').ToObeject<List<string>>() : null;
DateTime? startHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.First()) : null;
DateTime? endHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.Last()) : null;
// 根据是否传入健康师ID或科技部老师ID来决定查询方式
ISugarQueryable<LqXhHyhkEntity> query = null;
// 如果两个都传入了,需要同时JOIN两个表
if (!string.IsNullOrEmpty(input.jksId) && !string.IsNullOrEmpty(input.kjblsId))
{
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
305
|
query = _db.Queryable<LqXhJksyjEntity, LqXhKjbsyjEntity, LqXhHyhkEntity>((jksyj, kjbsyj, hyhk) => jksyj.Glkdbh == hyhk.Id && kjbsyj.Glkdbh == hyhk.Id)
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
|
.Where((jksyj, kjbsyj, hyhk) => jksyj.Jkszh == input.jksId && jksyj.IsEffective == StatusEnum.有效.GetHashCode())
.Where((jksyj, kjbsyj, hyhk) => kjbsyj.Kjblszh == input.kjblsId && kjbsyj.IsEffective == StatusEnum.有效.GetHashCode())
.Select((jksyj, kjbsyj, hyhk) => hyhk)
.Distinct()
.MergeTable(); // 将多表结果集变成单表,后续可以使用it别名
}
// 如果只传入了健康师ID,需要通过JOIN健康师业绩表来过滤
else if (!string.IsNullOrEmpty(input.jksId))
{
query = _db.Queryable<LqXhJksyjEntity, LqXhHyhkEntity>(
(jksyj, hyhk) => jksyj.Glkdbh == hyhk.Id)
.Where((jksyj, hyhk) => jksyj.Jkszh == input.jksId && jksyj.IsEffective == StatusEnum.有效.GetHashCode())
.Select((jksyj, hyhk) => hyhk)
.Distinct()
.MergeTable(); // 将多表结果集变成单表,后续可以使用it别名
}
// 如果只传入了科技部老师ID,需要通过JOIN科技部老师业绩表来过滤
else if (!string.IsNullOrEmpty(input.kjblsId))
{
query = _db.Queryable<LqXhKjbsyjEntity, LqXhHyhkEntity>(
(kjbsyj, hyhk) => kjbsyj.Glkdbh == hyhk.Id)
.Where((kjbsyj, hyhk) => kjbsyj.Kjblszh == input.kjblsId && kjbsyj.IsEffective == StatusEnum.有效.GetHashCode())
.Select((kjbsyj, hyhk) => hyhk)
.Distinct()
.MergeTable(); // 将多表结果集变成单表,后续可以使用it别名
}
// 如果都没有传入,直接查询耗卡表
else
{
query = _db.Queryable<LqXhHyhkEntity>();
}
var data = await query
.WhereIF(!string.IsNullOrEmpty(input.keyword), p => p.Hymc.Contains(input.keyword) || p.Hyzh.Contains(input.keyword) || p.MemberPhone.Contains(input.keyword))
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md))
.WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh))
.WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc))
.WhereIF(!string.IsNullOrEmpty(input.hy), p => p.Hy.Equals(input.hy))
.WhereIF(!string.IsNullOrEmpty(input.hyzh), p => p.Hyzh.Contains(input.hyzh))
.WhereIF(!string.IsNullOrEmpty(input.hymc), p => p.Hymc.Contains(input.hymc))
.WhereIF(!string.IsNullOrEmpty(input.gklx), p => p.Gklx.Equals(input.gklx))
.WhereIF(!string.IsNullOrEmpty(input.sfykjb), p => p.Sfykjb.Equals(input.sfykjb))
.WhereIF(queryHksj != null, p => p.Hksj >= new DateTime(startHksj.ToDate().Year, startHksj.ToDate().Month, startHksj.ToDate().Day, 0, 0, 0))
.WhereIF(queryHksj != null, p => p.Hksj <= new DateTime(endHksj.ToDate().Year, endHksj.ToDate().Month, endHksj.ToDate().Day, 23, 59, 59))
.WhereIF(!string.IsNullOrEmpty(input.czry), p => p.Czry.Equals(input.czry))
.WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
.Select(it => new LqXhHyhkListOutput
{
id = it.Id,
md = it.Md,
mdbh = it.Mdbh,
mdmc = it.Mdmc,
hy = it.Hy,
hyzh = it.Hyzh,
hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Khmc),
gklx = it.Gklx,
xfje = SqlFunc.ToString(it.Xfje),
sgfy = SqlFunc.ToString(it.Sgfy),
sfykjb = it.Sfykjb,
hksj = it.Hksj,
czry = it.Czry,
memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Sjh),
isEffective = it.IsEffective,
signatureFile = it.SignatureFile,
overtimeCoefficient = it.OvertimeCoefficient,
originalSgfy = it.OriginalSgfy,
overtimeSgfy = it.OvertimeSgfy,
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
374
|
appointmentId = it.AppointmentId,
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
|
})
.MergeTable()
.OrderBy($"{sidx} {sort}")
.ToPagedListAsync(input.currentPage, input.pageSize);
// 获取当前页的耗卡记录ID列表
var consumeIds = data.list.Select(x => x.id).ToList();
// 批量查询耗卡明细
var consumeDetails = new List<LqXhPxmxInfoOutput>();
if (consumeIds.Any())
{
consumeDetails = await _db.Queryable<LqXhPxmxEntity>()
.Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqXhPxmxInfoOutput
{
id = x.Id,
consumeInfoId = x.ConsumeInfoId,
billingItemId = x.BillingItemId,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
memberId = x.MemberId,
createTime = x.CreateTIme,
projectNumber = x.ProjectNumber,
originalProjectNumber = x.OriginalProjectNumber,
overtimeProjectNumber = x.OvertimeProjectNumber,
sourceType = x.SourceType,
totalPrice = x.TotalPrice,
isEffective = x.IsEffective,
})
.ToListAsync();
}
// 按耗卡记录ID分组耗卡明细
var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId)
.ToDictionary(g => g.Key, g => g.ToList());
// 批量查询健康师业绩(性能优化:一次性查询所有耗卡的健康师业绩)
var jksyjList = new List<LqXhJksyjInfoOutput>();
if (consumeIds.Any())
{
// 先查询业绩数据
var jksyjEntities = await _db.Queryable<LqXhJksyjEntity>()
.Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
.ToListAsync();
// 批量查询耗卡记录获取会员ID
var hyhkList = await _db.Queryable<LqXhHyhkEntity>()
.Where(x => consumeIds.Contains(x.Id))
.Select(x => new { x.Id, x.Hy })
.ToListAsync();
var hyhkDict = hyhkList.ToDictionary(x => x.Id, x => x.Hy);
// 批量查询会员信息
var memberIds = hyhkDict.Values.Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
var memberList = new List<(string Id, string Khmc)>();
if (memberIds.Any())
{
var memberData = await _db.Queryable<LqKhxxEntity>()
.Where(x => memberIds.Contains(x.Id))
.Select(x => new { x.Id, x.Khmc })
.ToListAsync();
memberList = memberData.Select(x => (x.Id, x.Khmc)).ToList();
}
var memberDict = memberList.ToDictionary(x => x.Id, x => x.Khmc);
// 转换为输出DTO
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,
memberId = hyhkDict.ContainsKey(x.Glkdbh) ? hyhkDict[x.Glkdbh] : null,
memberName = hyhkDict.ContainsKey(x.Glkdbh) && memberDict.ContainsKey(hyhkDict[x.Glkdbh])
? memberDict[hyhkDict[x.Glkdbh]]
: null,
}).ToList();
}
// 批量查询科技部老师业绩(性能优化:一次性查询所有耗卡的科技部老师业绩)
var kjbsyjList = new List<LqXhKjbsyjInfoOutput>();
if (consumeIds.Any())
{
kjbsyjList = await _db.Queryable<LqXhKjbsyjEntity>()
.Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqXhKjbsyjInfoOutput
{
id = x.Id,
glkdbh = x.Glkdbh,
kjbls = x.Kjbls,
kjblsxm = x.Kjblsxm,
kjblszh = x.Kjblszh,
kjblsyj = SqlFunc.ToString(x.Kjblsyj),
yjsj = x.Yjsj,
hkpxid = x.Hkpxid,
laborCost = x.LaborCost,
hdpxNumber = x.HdpxNumber,
originalHdpxNumber = x.OriginalHdpxNumber,
overtimeHdpxNumber = x.OvertimeHdpxNumber,
originalLaborCost = x.OriginalLaborCost,
overtimeLaborCost = x.OvertimeLaborCost,
})
.ToListAsync();
}
// 按耗卡记录ID分组健康师业绩
var jksyjGrouped = jksyjList.GroupBy(x => x.glkdbh)
.ToDictionary(g => g.Key, g => g.ToList());
// 按耗卡记录ID分组科技部老师业绩
var kjbsyjGrouped = kjbsyjList.GroupBy(x => x.glkdbh)
.ToDictionary(g => g.Key, g => g.ToList());
// 为每个耗卡记录分配耗卡明细、健康师业绩和科技部老师业绩
foreach (var item in data.list)
{
item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id)
? consumeDetailsGrouped[item.id]
: new List<LqXhPxmxInfoOutput>();
item.lqXhJksyjList = jksyjGrouped.ContainsKey(item.id)
? jksyjGrouped[item.id]
: new List<LqXhJksyjInfoOutput>();
item.lqXhKjbsyjList = kjbsyjGrouped.ContainsKey(item.id)
? kjbsyjGrouped[item.id]
: new List<LqXhKjbsyjInfoOutput>();
}
return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(data);
}
#endregion
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
|
#region 根据健康师ID获取耗卡列表
/// <summary>
/// 根据健康师ID获取耗卡列表
/// </summary>
/// <remarks>
/// 根据健康师ID查询该健康师参与的所有耗卡记录,支持时间周期查询和分页
///
/// 示例请求:
/// GET /api/Extend/LqXhHyhk/GetListByJksId?jksId=健康师ID&startTime=2025-01-01&endTime=2025-01-31&currentPage=1&pageSize=10
///
/// 参数说明:
/// - jksId: 健康师ID(必填)
/// - startTime: 开始时间(可选,格式:yyyy-MM-dd 或 yyyy-MM-dd HH:mm:ss)
/// - endTime: 结束时间(可选,格式:yyyy-MM-dd 或 yyyy-MM-dd HH:mm:ss)
/// - md: 门店ID(可选)
/// - isEffective: 是否有效(可选,0=全部,1=有效,2=无效,默认1)
/// - currentPage: 当前页码(必填)
/// - pageSize: 每页数量(必填)
///
/// 返回说明:
/// - 返回格式与GetList接口相同,包含耗卡基本信息及耗卡明细列表
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>耗卡列表(分页)</returns>
/// <response code="200">查询成功</response>
/// <response code="400">参数错误</response>
/// <response code="500">服务器内部错误</response>
[HttpGet("GetListByJksId")]
public async Task<dynamic> GetListByJksId([FromQuery] LqXhHyhkListByJksQueryInput input)
{
try
{
if (string.IsNullOrEmpty(input.jksId))
{
throw NCCException.Oh("健康师ID不能为空");
}
var sidx = input.sidx == null ? "hksj" : input.sidx;
var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
// 解析时间范围
DateTime? startDate = null;
DateTime? endDate = null;
if (!string.IsNullOrEmpty(input.startTime))
{
startDate = Ext.GetDateTime(input.startTime);
}
if (!string.IsNullOrEmpty(input.endTime))
{
endDate = Ext.GetDateTime(input.endTime);
// 如果只传了日期,则设置为当天的23:59:59
if (endDate.HasValue && !input.endTime.Contains(":"))
{
endDate = new DateTime(endDate.Value.Year, endDate.Value.Month, endDate.Value.Day, 23, 59, 59);
}
}
// 通过健康师业绩表关联查询耗卡记录
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
581
|
var data = await _db.Queryable<LqXhJksyjEntity, LqXhHyhkEntity>((jksyj, hyhk) => jksyj.Glkdbh == hyhk.Id)
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
|
.Where((jksyj, hyhk) => jksyj.Jkszh == input.jksId)
.WhereIF(input.isEffective != 0, (jksyj, hyhk) => jksyj.IsEffective == input.isEffective && hyhk.IsEffective == input.isEffective)
.WhereIF(input.isEffective == 0, (jksyj, hyhk) => jksyj.IsEffective == StatusEnum.有效.GetHashCode() && hyhk.IsEffective == StatusEnum.有效.GetHashCode())
.WhereIF(startDate.HasValue, (jksyj, hyhk) => hyhk.Hksj >= startDate.Value)
.WhereIF(endDate.HasValue, (jksyj, hyhk) => hyhk.Hksj <= endDate.Value)
.WhereIF(!string.IsNullOrEmpty(input.md), (jksyj, hyhk) => hyhk.Md == input.md)
.Select((jksyj, hyhk) => new LqXhHyhkListOutput
{
id = hyhk.Id,
md = hyhk.Md,
mdbh = hyhk.Mdbh,
mdmc = hyhk.Mdmc,
hy = hyhk.Hy,
hyzh = hyhk.Hyzh,
hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Khmc),
gklx = hyhk.Gklx,
xfje = SqlFunc.ToString(hyhk.Xfje),
sgfy = SqlFunc.ToString(hyhk.Sgfy),
sfykjb = hyhk.Sfykjb,
hksj = hyhk.Hksj,
czry = hyhk.Czry,
memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Sjh),
isEffective = hyhk.IsEffective,
signatureFile = hyhk.SignatureFile,
overtimeCoefficient = hyhk.OvertimeCoefficient,
originalSgfy = hyhk.OriginalSgfy,
overtimeSgfy = hyhk.OvertimeSgfy,
})
.MergeTable()
.Distinct() // 去重,因为一个耗卡可能对应多个健康师业绩记录
.OrderBy($"{sidx} {sort}")
.ToPagedListAsync(input.currentPage, input.pageSize);
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
615
616
|
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
617
618
|
// 获取当前页的耗卡记录ID列表
var consumeIds = data.list.Select(x => x.id).ToList();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
|
// 获取人次记录列表
var personTimesRecordList = await _db.Queryable<LqPersonTimesRecordEntity>().Where(x => consumeIds.Contains(x.BusinessId) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqPersonTimesRecordListOutput
{
id = x.Id,
businessId = x.BusinessId,
businessType = x.BusinessType,
personType = x.PersonType,
personId = x.PersonId,
personName = x.PersonName,
memberId = x.MemberId,
memberName = x.MemberName,
workDate = x.WorkDate,
workMonth = x.WorkMonth,
quantity = x.Quantity,
createTime = x.CreateTime,
isEffective = x.IsEffective,
})
.ToListAsync();
// 按耗卡记录ID分组人次记录
var personTimesRecordGrouped = personTimesRecordList.GroupBy(x => x.businessId).ToDictionary(g => g.Key, g => g.ToList());
// 为每个耗卡记录分配人次记录
foreach (var item in data.list)
{
item.personTimesRecordList = personTimesRecordGrouped.ContainsKey(item.id) ? personTimesRecordGrouped[item.id] : new List<LqPersonTimesRecordListOutput>();
}
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
645
646
647
648
|
// 批量查询耗卡明细
var consumeDetails = new List<LqXhPxmxInfoOutput>();
if (consumeIds.Any())
{
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
649
|
consumeDetails = await _db.Queryable<LqXhPxmxEntity>().Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode())
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
|
.Select(x => new LqXhPxmxInfoOutput
{
id = x.Id,
consumeInfoId = x.ConsumeInfoId,
billingItemId = x.BillingItemId,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
memberId = x.MemberId,
createTime = x.CreateTIme,
projectNumber = x.ProjectNumber,
originalProjectNumber = x.OriginalProjectNumber,
overtimeProjectNumber = x.OvertimeProjectNumber,
sourceType = x.SourceType,
totalPrice = x.TotalPrice,
isEffective = x.IsEffective,
})
.ToListAsync();
}
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
669
|
// 按耗卡记录ID分组耗卡明细
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
670
|
var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId).ToDictionary(g => g.Key, g => g.ToList());
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
671
672
673
|
// 为每个耗卡记录分配耗卡明细
foreach (var item in data.list)
{
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
674
|
item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id) ? consumeDetailsGrouped[item.id] : new List<LqXhPxmxInfoOutput>();
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
675
|
}
|
18e03666
“wangming”
完善耗卡列表接口:修复多表查询别名...
|
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
|
return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
_logger.LogError(ex, $"根据健康师ID获取耗卡列表失败 - 健康师ID: {input?.jksId}, 开始时间: {input?.startTime}, 结束时间: {input?.endTime}");
throw NCCException.Oh($"根据健康师ID获取耗卡列表失败: {ex.Message}");
}
}
#endregion
#region 根据科技部老师ID获取耗卡列表
/// <summary>
/// 根据科技部老师ID获取耗卡列表
/// </summary>
/// <remarks>
/// 根据科技部老师ID查询该老师参与的所有耗卡记录,支持时间周期查询和分页
///
/// 示例请求:
/// GET /api/Extend/LqXhHyhk/GetListByKjbId?kjblsId=科技部老师ID&startTime=2025-01-01&endTime=2025-01-31&currentPage=1&pageSize=10
///
/// 参数说明:
/// - kjblsId: 科技部老师ID(必填)
/// - startTime: 开始时间(可选,格式:yyyy-MM-dd 或 yyyy-MM-dd HH:mm:ss)
/// - endTime: 结束时间(可选,格式:yyyy-MM-dd 或 yyyy-MM-dd HH:mm:ss)
/// - md: 门店ID(可选)
/// - isEffective: 是否有效(可选,0=全部,1=有效,2=无效,默认1)
/// - currentPage: 当前页码(必填)
/// - pageSize: 每页数量(必填)
///
/// 返回说明:
/// - 返回格式与GetList接口相同,包含耗卡基本信息及耗卡明细列表
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>耗卡列表(分页)</returns>
/// <response code="200">查询成功</response>
/// <response code="400">参数错误</response>
/// <response code="500">服务器内部错误</response>
[HttpGet("GetListByKjbId")]
public async Task<dynamic> GetListByKjbId([FromQuery] LqXhHyhkListByKjbQueryInput input)
{
try
{
if (string.IsNullOrEmpty(input.kjblsId))
{
throw NCCException.Oh("科技部老师ID不能为空");
}
var sidx = input.sidx == null ? "hksj" : input.sidx;
var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
// 解析时间范围
DateTime? startDate = null;
DateTime? endDate = null;
if (!string.IsNullOrEmpty(input.startTime))
{
startDate = Ext.GetDateTime(input.startTime);
}
if (!string.IsNullOrEmpty(input.endTime))
{
endDate = Ext.GetDateTime(input.endTime);
// 如果只传了日期,则设置为当天的23:59:59
if (endDate.HasValue && !input.endTime.Contains(":"))
{
endDate = new DateTime(endDate.Value.Year, endDate.Value.Month, endDate.Value.Day, 23, 59, 59);
}
}
// 通过科技部老师业绩表关联查询耗卡记录
var data = await _db.Queryable<LqXhKjbsyjEntity, LqXhHyhkEntity>(
(kjbsyj, hyhk) => kjbsyj.Glkdbh == hyhk.Id)
.Where((kjbsyj, hyhk) => kjbsyj.Kjblszh == input.kjblsId)
.WhereIF(input.isEffective != 0, (kjbsyj, hyhk) => kjbsyj.IsEffective == input.isEffective && hyhk.IsEffective == input.isEffective)
.WhereIF(input.isEffective == 0, (kjbsyj, hyhk) => kjbsyj.IsEffective == StatusEnum.有效.GetHashCode() && hyhk.IsEffective == StatusEnum.有效.GetHashCode())
.WhereIF(startDate.HasValue, (kjbsyj, hyhk) => hyhk.Hksj >= startDate.Value)
.WhereIF(endDate.HasValue, (kjbsyj, hyhk) => hyhk.Hksj <= endDate.Value)
.WhereIF(!string.IsNullOrEmpty(input.md), (kjbsyj, hyhk) => hyhk.Md == input.md)
.Select((kjbsyj, hyhk) => new LqXhHyhkListOutput
{
id = hyhk.Id,
md = hyhk.Md,
mdbh = hyhk.Mdbh,
mdmc = hyhk.Mdmc,
hy = hyhk.Hy,
hyzh = hyhk.Hyzh,
hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Khmc),
gklx = hyhk.Gklx,
xfje = SqlFunc.ToString(hyhk.Xfje),
sgfy = SqlFunc.ToString(hyhk.Sgfy),
sfykjb = hyhk.Sfykjb,
hksj = hyhk.Hksj,
czry = hyhk.Czry,
memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Sjh),
isEffective = hyhk.IsEffective,
signatureFile = hyhk.SignatureFile,
overtimeCoefficient = hyhk.OvertimeCoefficient,
originalSgfy = hyhk.OriginalSgfy,
overtimeSgfy = hyhk.OvertimeSgfy,
})
.MergeTable()
.Distinct() // 去重,因为一个耗卡可能对应多个科技部老师业绩记录
.OrderBy($"{sidx} {sort}")
.ToPagedListAsync(input.currentPage, input.pageSize);
// 获取当前页的耗卡记录ID列表
var consumeIds = data.list.Select(x => x.id).ToList();
// 批量查询耗卡明细
var consumeDetails = new List<LqXhPxmxInfoOutput>();
if (consumeIds.Any())
{
consumeDetails = await _db.Queryable<LqXhPxmxEntity>()
.Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqXhPxmxInfoOutput
{
id = x.Id,
consumeInfoId = x.ConsumeInfoId,
billingItemId = x.BillingItemId,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
memberId = x.MemberId,
createTime = x.CreateTIme,
projectNumber = x.ProjectNumber,
originalProjectNumber = x.OriginalProjectNumber,
overtimeProjectNumber = x.OvertimeProjectNumber,
sourceType = x.SourceType,
totalPrice = x.TotalPrice,
isEffective = x.IsEffective,
})
.ToListAsync();
}
// 按耗卡记录ID分组耗卡明细
var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId)
.ToDictionary(g => g.Key, g => g.ToList());
// 为每个耗卡记录分配耗卡明细
foreach (var item in data.list)
{
item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id)
? consumeDetailsGrouped[item.id]
: new List<LqXhPxmxInfoOutput>();
}
return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
_logger.LogError(ex, $"根据科技部老师ID获取耗卡列表失败 - 科技部老师ID: {input?.kjblsId}, 开始时间: {input?.startTime}, 结束时间: {input?.endTime}");
throw NCCException.Oh($"根据科技部老师ID获取耗卡列表失败: {ex.Message}");
}
}
#endregion
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
830
|
#region 新建会员耗卡
|
96009bc9
hexiaodong
hxd
|
831
832
833
|
/// <summary>
/// 新建会员耗卡
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
834
835
|
/// <remarks>
/// 创建会员耗卡记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
|
d98270e2
“wangming”
Enhance LqEventSe...
|
836
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
|
/// 示例请求:
/// ```json
/// {
/// "hyid": "会员ID",
/// "hkmd": "耗卡门店",
/// "hksj": "2025-01-11",
/// "lqXhPxmxList": [
/// {
/// "px": "品项编号",
/// "pxmc": "品项名称",
/// "pxjg": 100.00,
/// "projectNumber": 1,
/// "xfzs": "否",
/// "lqXhJksyjList": [
/// {
/// "jks": "健康师",
/// "jksxm": "健康师姓名",
/// "jksyj": "100"
/// }
/// ]
/// }
/// ]
/// }
/// ```
|
d98270e2
“wangming”
Enhance LqEventSe...
|
861
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
862
863
864
865
866
867
868
869
870
871
|
/// 参数说明:
/// - hyid: 会员ID
/// - hkmd: 耗卡门店
/// - lqXhPxmxList: 耗卡品项明细列表
/// </remarks>
/// <param name="input">会员耗卡创建参数</param>
/// <returns>无返回值</returns>
/// <response code="200">创建成功</response>
/// <response code="400">参数错误或数据验证失败</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
872
873
874
875
|
[HttpPost("")]
public async Task Create([FromBody] LqXhHyhkCrInput input)
{
var userInfo = await _userManager.GetUserInfo();
|
fc259a33
“wangming”
feat: 添加消耗功能加班相关字...
|
876
|
//首先判断当前时间是否是加班时间
|
96009bc9
hexiaodong
hxd
|
877
878
|
var entity = input.Adapt<LqXhHyhkEntity>();
entity.Id = YitIdHelper.NextId().ToString();
|
96009bc9
hexiaodong
hxd
|
879
|
entity.Czry = _userManager.UserId;
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
880
|
entity.MemberPhone = _db.Queryable<LqKhxxEntity>().Where(w => w.Id == entity.Hy).First().Sjh;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
881
|
entity.CreateTime = DateTime.Now;
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
882
883
|
entity.IsEffective = StatusEnum.有效.GetHashCode();
entity.UpdateTime = DateTime.Now;
|
fc259a33
“wangming”
feat: 添加消耗功能加班相关字...
|
884
|
entity.OvertimeCoefficient = input.overtimeCoefficient ?? 0;
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
885
|
entity.OriginalSgfy = input.sgfy;
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
886
|
entity.AppointmentId = input.appointmentId;
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
887
888
889
890
|
//加班手工费 = 原始手工费 * 加班系数
entity.OvertimeSgfy = entity.OriginalSgfy * entity.OvertimeCoefficient;
//最终手工费 = 原始手工费 + 加班手工费
entity.Sgfy = entity.OriginalSgfy + entity.OvertimeSgfy;
|
96009bc9
hexiaodong
hxd
|
891
892
|
try
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
893
|
// 开启事务
|
96009bc9
hexiaodong
hxd
|
894
|
_db.BeginTran();
|
11b81187
“wangming”
feat: 优化业绩统计逻辑,按部...
|
895
896
897
898
899
900
901
|
// 查询会员信息
var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(w => w.Id == entity.Hy).FirstAsync();
//如果会员类型是线索,那么就更新为新客
if (memberInfo.Khlx == MemberTypeEnum.线索.GetHashCode().ToString())
{
memberInfo.Khlx = MemberTypeEnum.新客.GetHashCode().ToString();
}
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
902
903
|
//保存会员信息
await _db.Updateable(memberInfo).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
904
|
// 新增会员耗卡记录
|
96009bc9
hexiaodong
hxd
|
905
|
var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
906
907
908
909
|
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqXhPxmxEntity>();
var allJksyjEntities = new List<LqXhJksyjEntity>();
var allKjbsyjEntities = new List<LqXhKjbsyjEntity>();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
910
|
var allPersonTimesRecordEntities = new List<LqPersonTimesRecordEntity>();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
911
912
|
// 处理品项明细列表
if (input.lqXhPxmxList != null && input.lqXhPxmxList.Any())
|
96009bc9
hexiaodong
hxd
|
913
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
914
|
foreach (var item in input.lqXhPxmxList)
|
96009bc9
hexiaodong
hxd
|
915
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
916
917
918
919
|
// 创建品项明细实体
var lqXhPxmxEntity = new LqXhPxmxEntity
{
Id = YitIdHelper.NextId().ToString(),
|
b45d55f7
“wangming”
Refactor LqEventS...
|
920
921
|
ConsumeInfoId = newEntity.Id,
BillingItemId = item.billingItemId,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
922
|
CreateTIme = DateTime.Now,
|
fea13b4d
“wangming”
feat: 同步耗卡时间和创建时间字段
|
923
|
Yjsj = input.hksj,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
924
|
MemberId = entity.Hy,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
925
926
927
|
OriginalProjectNumber = item.projectNumber ?? 0,
OvertimeProjectNumber = (decimal)(entity.OvertimeCoefficient * (item.projectNumber ?? 0)),
ProjectNumber = (decimal)((item.projectNumber ?? 0) + (entity.OvertimeCoefficient * (item.projectNumber ?? 0))),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
928
929
930
931
|
TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)),
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
932
|
SourceType = item.sourceType,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
933
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
934
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
935
936
|
};
allPxmxEntities.Add(lqXhPxmxEntity);
|
d98270e2
“wangming”
Enhance LqEventSe...
|
937
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
938
939
940
941
942
|
// 收集该品项关联的健康师业绩
if (item.lqXhJksyjList != null && item.lqXhJksyjList.Any())
{
foreach (var ijks_tem in item.lqXhJksyjList)
{
|
d98270e2
“wangming”
Enhance LqEventSe...
|
943
944
945
946
947
948
949
950
951
|
allJksyjEntities.Add(
new LqXhJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
|
fea13b4d
“wangming”
feat: 同步耗卡时间和创建时间字段
|
952
953
|
Yjsj = input.hksj,
CreateTime = DateTime.Now,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
954
955
|
JsjId = ijks_tem.jsjId,
Kdpxid = lqXhPxmxEntity.Id,
|
dc3e0c1c
“wangming”
fix: 修复健康师业绩Labor...
|
956
957
958
|
OriginalLaborCost = ijks_tem.laborCost,
OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
LaborCost = (decimal)((ijks_tem.laborCost ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0))),
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
959
960
|
OriginalKdpxNumber = ijks_tem.kdpxNumber,
OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)),
|
3ab6f199
“wangming”
feat: 创建门店目标表和总经理...
|
961
962
963
|
KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))) + (ijks_tem.accompaniedProjectNumber ?? 0),
IsAccompanied = ijks_tem.isAccompanied,
AccompaniedProjectNumber = ijks_tem.accompaniedProjectNumber,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
964
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
d98270e2
“wangming”
Enhance LqEventSe...
|
965
966
|
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
967
968
|
}
}
|
d98270e2
“wangming”
Enhance LqEventSe...
|
969
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
970
971
972
973
974
|
// 收集该品项关联的科技部老师业绩
if (item.lqXhKjbsyjList != null && item.lqXhKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqXhKjbsyjList)
{
|
d98270e2
“wangming”
Enhance LqEventSe...
|
975
976
977
978
979
980
981
982
983
|
allKjbsyjEntities.Add(
new LqXhKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
|
fea13b4d
“wangming”
feat: 同步耗卡时间和创建时间字段
|
984
985
|
Yjsj = input.hksj,
CreateTime = DateTime.Now,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
986
|
Hkpxid = lqXhPxmxEntity.Id,
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
987
988
989
|
// OriginalHdpxNumber = ikjbs_tem.hdpxNumber,
// OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)),
// HdpxNumber = (decimal)((ikjbs_tem.hdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0))),
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
990
|
OriginalHdpxNumber = ikjbs_tem.hdpxNumber,
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
991
992
993
994
995
|
OvertimeHdpxNumber = 0,
HdpxNumber = ikjbs_tem.hdpxNumber,
// OriginalLaborCost = ikjbs_tem.laborCost,
// OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0)),
// LaborCost = (decimal)((ikjbs_tem.laborCost ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0))),
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
996
|
OriginalLaborCost = ikjbs_tem.laborCost,
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
997
998
|
OvertimeLaborCost = 0,
LaborCost = ikjbs_tem.laborCost,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
999
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1000
1001
|
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1002
1003
|
}
}
|
96009bc9
hexiaodong
hxd
|
1004
|
}
|
96009bc9
hexiaodong
hxd
|
1005
|
}
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1006
1007
|
// 剔除所有T区健康师(姓名中包含"T区"的健康师)
var NoTallJksyjEntities = allJksyjEntities.Where(x => x.Jks != null && x.Jks != "" && (x.Jksxm == null || !x.Jksxm.Contains("T区"))).ToList();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1008
|
//获取这次耗卡有多少个健康师
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1009
|
var jksCount = NoTallJksyjEntities.GroupBy(x => x.Jks).Count();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1010
|
//添加到人次表里面去
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1011
|
foreach (var item in NoTallJksyjEntities.Select(x => x.Jks).Distinct())
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1012
1013
1014
1015
1016
1017
1018
1019
|
{
LqPersonTimesRecordEntity personTimesRecordEntity = new LqPersonTimesRecordEntity
{
Id = YitIdHelper.NextId().ToString(),
BusinessId = newEntity.Id,
BusinessType = "耗卡",
PersonType = "健康师",
PersonId = item,
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1020
|
PersonName = NoTallJksyjEntities.Where(x => x.Jks == item).Select(x => x.Jksxm).First(),
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
|
MemberId = entity.Hy,
MemberName = memberInfo.Khmc,
WorkDate = input.hksj,
WorkMonth = input.hksj.ToDate().ToString("yyyyMM"),
Quantity = 1 / (decimal)jksCount,
CreateTime = DateTime.Now,
IsEffective = StatusEnum.有效.GetHashCode(),
};
allPersonTimesRecordEntities.Add(personTimesRecordEntity);
}
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1031
1032
|
//剔除所有T区科技部老师(姓名中包含"T区"的科技部老师)
var NoTallKjbsyjEntities = allKjbsyjEntities.Where(x => x.Kjbls != null && x.Kjbls != "" && (x.Kjblsxm == null || !x.Kjblsxm.Contains("T区"))).ToList();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1033
|
//获取这次耗卡有多少个科技部老师
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1034
|
var kjbCount = NoTallKjbsyjEntities.GroupBy(x => x.Kjbls).Count();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1035
|
//添加到人次表里面去
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1036
|
foreach (var item in NoTallKjbsyjEntities.Select(x => x.Kjbls).Distinct())
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1037
1038
1039
1040
1041
1042
1043
1044
|
{
LqPersonTimesRecordEntity personTimesRecordEntity = new LqPersonTimesRecordEntity
{
Id = YitIdHelper.NextId().ToString(),
BusinessId = newEntity.Id,
BusinessType = "耗卡",
PersonType = "科技部老师",
PersonId = item,
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1045
|
PersonName = NoTallKjbsyjEntities.Where(x => x.Kjbls == item).Select(x => x.Kjblsxm).First(),
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
|
MemberId = entity.Hy,
MemberName = memberInfo.Khmc,
WorkDate = input.hksj,
WorkMonth = input.hksj.ToDate().ToString("yyyyMM"),
Quantity = 1 / (decimal)kjbCount,
CreateTime = DateTime.Now,
IsEffective = StatusEnum.有效.GetHashCode(),
};
allPersonTimesRecordEntities.Add(personTimesRecordEntity);
}
// 批量插入人次记录
if (allPersonTimesRecordEntities.Any())
{
await _db.Insertable(allPersonTimesRecordEntities).ExecuteCommandAsync();
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1061
1062
|
// 批量插入品项明细
if (allPxmxEntities.Any())
|
96009bc9
hexiaodong
hxd
|
1063
|
{
|
dac8767e
“wangming”
111111111
|
1064
|
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1065
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1066
1067
|
// 批量插入健康师业绩
if (allJksyjEntities.Any())
|
96009bc9
hexiaodong
hxd
|
1068
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1069
|
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1070
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1071
1072
1073
1074
1075
1076
|
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
}
// 提交事务
|
96009bc9
hexiaodong
hxd
|
1077
1078
|
_db.CommitTran();
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1079
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
1080
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1081
|
// 回滚事务
|
96009bc9
hexiaodong
hxd
|
1082
|
_db.RollbackTran();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1083
1084
1085
|
Console.WriteLine($"新建会员耗卡失败: {ex.Message}");
Console.WriteLine($"堆栈跟踪: {ex.StackTrace}");
throw NCCException.Oh(ErrorCode.COM1000, $"新建会员耗卡失败: {ex.Message}");
|
96009bc9
hexiaodong
hxd
|
1086
1087
|
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1088
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1089
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1090
|
#region 获取会员耗卡无分页列表
|
96009bc9
hexiaodong
hxd
|
1091
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1092
1093
1094
1095
|
/// 获取会员耗卡无分页列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
|
[NonAction]
public async Task<dynamic> GetNoPagingList([FromQuery] LqXhHyhkListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
List<string> queryHksj = input.hksj != null ? input.hksj.Split(',').ToObeject<List<string>>() : null;
DateTime? startHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.First()) : null;
DateTime? endHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.Last()) : null;
var data = await _db.Queryable<LqXhHyhkEntity>()
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md))
.WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh))
.WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc))
.WhereIF(!string.IsNullOrEmpty(input.hy), p => p.Hy.Equals(input.hy))
.WhereIF(!string.IsNullOrEmpty(input.hyzh), p => p.Hyzh.Contains(input.hyzh))
.WhereIF(!string.IsNullOrEmpty(input.hymc), p => p.Hymc.Contains(input.hymc))
.WhereIF(!string.IsNullOrEmpty(input.gklx), p => p.Gklx.Equals(input.gklx))
|
96009bc9
hexiaodong
hxd
|
1112
1113
1114
1115
|
.WhereIF(!string.IsNullOrEmpty(input.sfykjb), p => p.Sfykjb.Equals(input.sfykjb))
.WhereIF(queryHksj != null, p => p.Hksj >= new DateTime(startHksj.ToDate().Year, startHksj.ToDate().Month, startHksj.ToDate().Day, 0, 0, 0))
.WhereIF(queryHksj != null, p => p.Hksj <= new DateTime(endHksj.ToDate().Year, endHksj.ToDate().Month, endHksj.ToDate().Day, 23, 59, 59))
.WhereIF(!string.IsNullOrEmpty(input.czry), p => p.Czry.Equals(input.czry))
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1116
|
.Select(it => new LqXhHyhkListOutput
|
96009bc9
hexiaodong
hxd
|
1117
1118
|
{
id = it.Id,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1119
1120
1121
1122
1123
|
md = it.Md,
mdbh = it.Mdbh,
mdmc = it.Mdmc,
hy = it.Hy,
hyzh = it.Hyzh,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1124
1125
|
hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Khmc),
memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Sjh),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1126
|
gklx = it.Gklx,
|
d7925aaa
“wangming”
星期五了,下班咯
|
1127
1128
|
xfje = SqlFunc.ToString(it.Xfje),
sgfy = SqlFunc.ToString(it.Sgfy),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1129
1130
1131
|
sfykjb = it.Sfykjb,
hksj = it.Hksj,
czry = it.Czry,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1132
1133
1134
1135
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToListAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1136
|
return data;
|
96009bc9
hexiaodong
hxd
|
1137
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1138
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1139
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1140
|
#region 导出会员耗卡
|
96009bc9
hexiaodong
hxd
|
1141
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1142
1143
1144
1145
|
/// 导出会员耗卡
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
|
[HttpGet("Actions/Export")]
public async Task<dynamic> Export([FromQuery] LqXhHyhkListQueryInput input)
{
var userInfo = await _userManager.GetUserInfo();
var exportData = new List<LqXhHyhkListOutput>();
if (input.dataType == 0)
{
var data = Clay.Object(await this.GetList(input));
exportData = data.Solidify<PageResult<LqXhHyhkListOutput>>().list;
}
else
{
exportData = await this.GetNoPagingList(input);
}
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1160
1161
|
List<ParamsModel> paramList =
"[{\"value\":\"耗卡编号\",\"field\":\"id\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"门店编号\",\"field\":\"mdbh\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},{\"value\":\"会员\",\"field\":\"hy\"},{\"value\":\"会员账号\",\"field\":\"hyzh\"},{\"value\":\"会员名称\",\"field\":\"hymc\"},{\"value\":\"顾客类型\",\"field\":\"gklx\"},{\"value\":\"消费金额\",\"field\":\"xfje\"},{\"value\":\"手工费用\",\"field\":\"sgfy\"},{\"value\":\"是否有科技部\",\"field\":\"sfykjb\"},{\"value\":\"耗卡时间\",\"field\":\"hksj\"},{\"value\":\"操作人员\",\"field\":\"czry\"},]".ToList<ParamsModel>();
|
96009bc9
hexiaodong
hxd
|
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
|
ExcelConfig excelconfig = new ExcelConfig();
excelconfig.FileName = "会员耗卡.xls";
excelconfig.HeadFont = "微软雅黑";
excelconfig.HeadPoint = 10;
excelconfig.IsAllSizeColumn = true;
excelconfig.ColumnModel = new List<ExcelColumnModel>();
List<string> selectKeyList = input.selectKey.Split(',').ToList();
foreach (var item in selectKeyList)
{
var isExist = paramList.Find(p => p.field == item);
if (isExist != null)
{
excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
}
}
var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
ExcelExportHelper<LqXhHyhkListOutput>.Export(exportData, excelconfig, addPath);
var fileName = _userManager.UserId + "|" + addPath + "|xls";
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1180
|
var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
|
96009bc9
hexiaodong
hxd
|
1181
1182
|
return output;
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1183
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1184
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1185
|
#region 批量删除会员耗卡
|
96009bc9
hexiaodong
hxd
|
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
|
/// <summary>
/// 批量删除会员耗卡
/// </summary>
/// <param name="ids">主键数组</param>
/// <returns></returns>
[HttpPost("batchRemove")]
public async Task BatchRemove([FromBody] List<string> ids)
{
var entitys = await _db.Queryable<LqXhHyhkEntity>().In(it => it.Id, ids).ToListAsync();
if (entitys.Count > 0)
{
try
{
//开启事务
_db.BeginTran();
//批量删除会员耗卡
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1202
|
await _db.Deleteable<LqXhHyhkEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1203
1204
|
//清空子表数据
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1205
|
await _db.Deleteable<LqXhJksyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1206
1207
|
//清空子表数据
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1208
|
await _db.Deleteable<LqXhKjbsyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1209
1210
|
//清空子表数据
|
b45d55f7
“wangming”
Refactor LqEventS...
|
1211
|
await _db.Deleteable<LqXhPxmxEntity>().In(u => u.ConsumeInfoId, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
|
//关闭事务
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1002);
}
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1223
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1224
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1225
|
#region 更新会员耗卡
|
96009bc9
hexiaodong
hxd
|
1226
|
/// <summary>
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1227
|
/// 更新会员耗卡
|
96009bc9
hexiaodong
hxd
|
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
|
/// </summary>
/// <param name="id">主键</param>
/// <param name="input">参数</param>
/// <returns></returns>
[HttpPut("{id}")]
public async Task Update(string id, [FromBody] LqXhHyhkUpInput input)
{
var entity = input.Adapt<LqXhHyhkEntity>();
try
{
//开启事务
_db.BeginTran();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1240
1241
1242
1243
1244
1245
|
//查询记录
var LqXhHyhkInfo = await _db.Queryable<LqXhHyhkEntity>().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
if (LqXhHyhkInfo == null)
{
throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
}
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1246
|
entity.UpdateTime = DateTime.Now;
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
1247
1248
1249
|
entity.OvertimeCoefficient = input.overtimeCoefficient;
entity.OriginalSgfy = input.sgfy;
entity.OvertimeSgfy = (decimal)(entity.OvertimeCoefficient * input.sgfy);
|
e09804e2
“wangming”
fix: 更新消耗服务相关代码
|
1250
|
entity.Sgfy = entity.OriginalSgfy + entity.OvertimeSgfy;
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1251
|
entity.AppointmentId = input.appointmentId;
|
96009bc9
hexiaodong
hxd
|
1252
1253
1254
|
//更新会员耗卡记录
await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
1255
1256
1257
1258
1259
1260
1261
1262
1263
|
var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(w => w.Id == entity.Hy).FirstAsync();
//如果会员类型是线索,那么就更新为新客
if (memberInfo.Khlx == MemberTypeEnum.线索.GetHashCode().ToString())
{
memberInfo.Khlx = MemberTypeEnum.新客.GetHashCode().ToString();
}
//保存会员信息
await _db.Updateable(memberInfo).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1264
1265
|
//清空原有数据
await _db.Deleteable<LqXhJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1266
|
await _db.Deleteable<LqXhKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1267
|
await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1268
|
await _db.Deleteable<LqPersonTimesRecordEntity>().Where(u => u.BusinessId == id).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1269
1270
1271
1272
|
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqXhPxmxEntity>();
var allJksyjEntities = new List<LqXhJksyjEntity>();
var allKjbsyjEntities = new List<LqXhKjbsyjEntity>();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1273
|
var allPersonTimesRecordEntities = new List<LqPersonTimesRecordEntity>();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1274
1275
|
// 处理品项明细列表
if (input.lqXhPxmxList != null && input.lqXhPxmxList.Any())
|
96009bc9
hexiaodong
hxd
|
1276
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1277
|
foreach (var item in input.lqXhPxmxList)
|
96009bc9
hexiaodong
hxd
|
1278
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1279
1280
|
// 创建品项明细实体
var lqXhPxmxEntity = new LqXhPxmxEntity
|
d7925aaa
“wangming”
星期五了,下班咯
|
1281
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1282
1283
1284
1285
|
Id = YitIdHelper.NextId().ToString(),
ConsumeInfoId = input.id,
BillingItemId = item.billingItemId,
CreateTIme = DateTime.Now,
|
fea13b4d
“wangming”
feat: 同步耗卡时间和创建时间字段
|
1286
|
Yjsj = input.hksj,
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1287
|
MemberId = entity.Hy,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
1288
|
TotalPrice = item.pxjg * (item.projectNumber ?? 1),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1289
1290
1291
1292
|
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
SourceType = item.sourceType,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
1293
1294
1295
1296
|
IsEffective = StatusEnum.有效.GetHashCode(),
OriginalProjectNumber = item.projectNumber ?? 0,
OvertimeProjectNumber = (decimal)(entity.OvertimeCoefficient * (item.projectNumber ?? 0)),
ProjectNumber = (decimal)((item.projectNumber ?? 0) + (entity.OvertimeCoefficient * (item.projectNumber ?? 0))),
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1297
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1298
|
};
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1299
|
allPxmxEntities.Add(lqXhPxmxEntity);
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1300
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1301
1302
1303
1304
1305
|
// 收集该品项关联的健康师业绩
if (item.lqXhJksyjList != null && item.lqXhJksyjList.Any())
{
foreach (var ijks_tem in item.lqXhJksyjList)
{
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1306
1307
1308
1309
|
allJksyjEntities.Add(
new LqXhJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1310
|
Glkdbh = input.id,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1311
1312
1313
1314
|
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
|
fea13b4d
“wangming”
feat: 同步耗卡时间和创建时间字段
|
1315
1316
|
Yjsj = input.hksj,
CreateTime = DateTime.Now,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1317
1318
|
JsjId = ijks_tem.jsjId,
Kdpxid = lqXhPxmxEntity.Id,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
1319
1320
|
OriginalKdpxNumber = ijks_tem.kdpxNumber,
OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)),
|
3ab6f199
“wangming”
feat: 创建门店目标表和总经理...
|
1321
|
KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))) + (ijks_tem.accompaniedProjectNumber ?? 0),
|
e09804e2
“wangming”
fix: 更新消耗服务相关代码
|
1322
1323
1324
|
OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
LaborCost = ijks_tem.laborCost + (entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
OriginalLaborCost = ijks_tem.laborCost,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
1325
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
3ab6f199
“wangming”
feat: 创建门店目标表和总经理...
|
1326
1327
|
IsAccompanied = ijks_tem.isAccompanied,
AccompaniedProjectNumber = ijks_tem.accompaniedProjectNumber,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1328
1329
|
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1330
1331
|
}
}
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1332
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1333
1334
1335
1336
1337
|
// 收集该品项关联的科技部老师业绩
if (item.lqXhKjbsyjList != null && item.lqXhKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqXhKjbsyjList)
{
|
1cf1bd86
“wangming”
feat: 添加项目资料表手工费字...
|
1338
1339
1340
1341
1342
1343
1344
1345
|
allKjbsyjEntities.Add(new LqXhKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = input.id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
|
fea13b4d
“wangming”
feat: 同步耗卡时间和创建时间字段
|
1346
1347
|
Yjsj = input.hksj,
CreateTime = DateTime.Now,
|
1cf1bd86
“wangming”
feat: 添加项目资料表手工费字...
|
1348
|
Hkpxid = lqXhPxmxEntity.Id,
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
1349
1350
1351
1352
1353
1354
|
// OriginalHdpxNumber = ikjbs_tem.hdpxNumber,
// OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)),
// HdpxNumber = (decimal)((ikjbs_tem.hdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0))),
// OriginalLaborCost = ikjbs_tem.laborCost,
// OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0)),
// LaborCost = (decimal)((ikjbs_tem.laborCost ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0))),
|
1cf1bd86
“wangming”
feat: 添加项目资料表手工费字...
|
1355
|
OriginalHdpxNumber = ikjbs_tem.hdpxNumber,
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
1356
1357
|
OvertimeHdpxNumber = 0,
HdpxNumber = ikjbs_tem.hdpxNumber,
|
1cf1bd86
“wangming”
feat: 添加项目资料表手工费字...
|
1358
|
OriginalLaborCost = ikjbs_tem.laborCost,
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
1359
1360
|
OvertimeLaborCost = 0,
LaborCost = ikjbs_tem.laborCost,
|
1cf1bd86
“wangming”
feat: 添加项目资料表手工费字...
|
1361
1362
|
IsEffective = StatusEnum.有效.GetHashCode(),
});
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1363
1364
|
}
}
|
96009bc9
hexiaodong
hxd
|
1365
|
}
|
96009bc9
hexiaodong
hxd
|
1366
|
}
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1367
1368
|
//剔除所有T区健康师(姓名中包含"T区"的健康师)
var NoTallJksyjEntities = allJksyjEntities.Where(x => x.Jks != null && x.Jks != "" && (x.Jksxm == null || !x.Jksxm.Contains("T区"))).ToList();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1369
|
//获取这次耗卡有多少个健康师
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1370
|
var jksCount = NoTallJksyjEntities.GroupBy(x => x.Jks).Count();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1371
|
//添加到人次表里面去
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1372
|
foreach (var item in NoTallJksyjEntities.Select(x => x.Jks).Distinct())
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1373
1374
1375
1376
1377
1378
1379
1380
|
{
LqPersonTimesRecordEntity personTimesRecordEntity = new LqPersonTimesRecordEntity
{
Id = YitIdHelper.NextId().ToString(),
BusinessId = input.id,
BusinessType = "耗卡",
PersonType = "健康师",
PersonId = item,
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1381
|
PersonName = NoTallJksyjEntities.Where(x => x.Jks == item).Select(x => x.Jksxm).First(),
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
|
MemberId = entity.Hy,
MemberName = memberInfo.Khmc,
WorkDate = input.hksj,
WorkMonth = input.hksj.ToDate().ToString("yyyyMM"),
Quantity = 1 / (decimal)jksCount,
CreateTime = DateTime.Now,
IsEffective = StatusEnum.有效.GetHashCode(),
};
allPersonTimesRecordEntities.Add(personTimesRecordEntity);
}
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1392
1393
|
//剔除所有T区科技部老师(姓名中包含"T区"的科技部老师)
var NoTallKjbsyjEntities = allKjbsyjEntities.Where(x => x.Kjbls != null && x.Kjbls != "" && (x.Kjblsxm == null || !x.Kjblsxm.Contains("T区"))).ToList();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1394
|
//获取这次耗卡有多少个科技部老师
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1395
|
var kjbCount = NoTallKjbsyjEntities.GroupBy(x => x.Kjbls).Count();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1396
|
//添加到人次表里面去
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1397
|
foreach (var item in NoTallKjbsyjEntities.Select(x => x.Kjbls).Distinct())
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1398
1399
1400
1401
1402
1403
1404
1405
|
{
LqPersonTimesRecordEntity personTimesRecordEntity = new LqPersonTimesRecordEntity
{
Id = YitIdHelper.NextId().ToString(),
BusinessId = input.id,
BusinessType = "耗卡",
PersonType = "科技部老师",
PersonId = item,
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1406
|
PersonName = NoTallKjbsyjEntities.Where(x => x.Kjbls == item).Select(x => x.Kjblsxm).First(),
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
|
MemberId = entity.Hy,
MemberName = memberInfo.Khmc,
WorkDate = input.hksj,
WorkMonth = input.hksj.ToDate().ToString("yyyyMM"),
Quantity = 1 / (decimal)kjbCount,
CreateTime = DateTime.Now,
IsEffective = StatusEnum.有效.GetHashCode(),
};
allPersonTimesRecordEntities.Add(personTimesRecordEntity);
}
// 批量插入人次记录
if (allPersonTimesRecordEntities.Any())
{
await _db.Insertable(allPersonTimesRecordEntities).ExecuteCommandAsync();
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1422
1423
|
// 批量插入品项明细
if (allPxmxEntities.Any())
|
96009bc9
hexiaodong
hxd
|
1424
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1425
|
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
|
}
// 批量插入健康师业绩
if (allJksyjEntities.Any())
{
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1436
|
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1437
|
// 提交事务
|
96009bc9
hexiaodong
hxd
|
1438
1439
1440
1441
1442
1443
1444
1445
1446
|
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1001);
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1447
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1448
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1449
|
#region 删除会员耗卡
|
96009bc9
hexiaodong
hxd
|
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
|
/// <summary>
/// 删除会员耗卡
/// </summary>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task Delete(string id)
{
var entity = await _db.Queryable<LqXhHyhkEntity>().FirstAsync(p => p.Id == id);
_ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
try
{
//开启事务
_db.BeginTran();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1463
|
|
96009bc9
hexiaodong
hxd
|
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
|
//删除会员耗卡记录
await _db.Deleteable<LqXhHyhkEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
//清空子表数据
await _db.Deleteable<LqXhJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
//清空子表数据
await _db.Deleteable<LqXhKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
//清空子表数据
|
b45d55f7
“wangming”
Refactor LqEventS...
|
1474
|
await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1475
|
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1476
1477
1478
|
//清空子表数据
await _db.Deleteable<LqPersonTimesRecordEntity>().Where(u => u.BusinessId == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
|
//关闭事务
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1002);
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1489
|
#endregion
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
|
#region 查询健康师消耗业绩列表
/// <summary>
/// 查询健康师业绩列表
/// </summary>
/// <param name="input">查询参数</param>
/// <returns>分页的健康师业绩列表</returns>
/// <remarks>
/// 查询健康师业绩记录,支持分页和时间筛选
///
/// 示例请求:
/// ```json
/// {
/// "glkdbh": "123456789",
/// "jksId": "健康师ID",
/// "startTime": "2025-01-01T00:00:00",
/// "endTime": "2025-01-31T23:59:59",
/// "currentPage": 1,
/// "pageSize": 10,
/// "sidx": "yjsj",
/// "sort": "desc"
/// }
/// ```
///
/// 参数说明:
/// - glkdbh: 开单记录ID(可选)
/// - jksId: 健康师ID(可选)
/// - startTime: 查询开始时间(可选)
/// - endTime: 查询结束时间(可选)
/// - currentPage: 当前页码
/// - pageSize: 每页大小
/// </remarks>
/// <response code="200">成功获取健康师业绩列表</response>
/// <response code="400">请求参数错误</response>
/// <response code="500">服务器内部错误</response>
[HttpGet("GetJksyjList")]
public async Task<dynamic> GetJksyjList([FromQuery] LqXhJksyjQueryInput input)
{
try
{
var sidx = string.IsNullOrEmpty(input.sidx) ? "yjsj" : input.sidx;
var sort = string.IsNullOrEmpty(input.sort) ? "desc" : input.sort;
var data = await _db.Queryable<LqXhJksyjEntity>()
.WhereIF(!string.IsNullOrEmpty(input.Glkdbh), w => w.Glkdbh == input.Glkdbh)
.WhereIF(!string.IsNullOrEmpty(input.JksId), w => w.Jks == input.JksId)
.WhereIF(input.StartTime.HasValue, w => w.Yjsj >= input.StartTime.Value)
.WhereIF(input.EndTime.HasValue, w => w.Yjsj <= input.EndTime.Value)
.Where(w => w.IsEffective == StatusEnum.有效.GetHashCode())
.Select(it => new LqXhJksyjInfoOutput
{
id = it.Id,
glkdbh = it.Glkdbh,
jks = it.Jks,
jksxm = it.Jksxm,
jkszh = it.Jkszh,
jksyj = it.Jksyj.ToString(),
yjsj = it.Yjsj,
jsjId = it.JsjId,
kdpxid = it.Kdpxid,
laborCost = it.LaborCost,
kdpxNumber = it.KdpxNumber,
storeName = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Mdmc),
memberId = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Hy),
memberName = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Hymc),
})
.MergeTable()
.OrderBy(sidx + " " + sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<LqXhJksyjInfoOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
throw NCCException.Oh($"获取健康师业绩列表失败: {ex.Message}");
}
}
#endregion
#region 耗卡记录作废
/// <summary>
/// 耗卡记录作废
/// </summary>
/// <param name="id">耗卡记录ID</param>
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1573
|
/// <param name="remarks">作废备注</param>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1574
1575
|
/// <returns></returns>
[HttpPut("CancelCardUsageRecord/{id}")]
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1576
|
public async Task<dynamic> CancelCardUsageRecord(string id, [FromQuery] string remarks = null)
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
|
{
try
{
//开启事务
_db.BeginTran();
//查询消耗记录表信息
var LqhyhkInfo = await _db.Queryable<LqXhHyhkEntity>().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
if (LqhyhkInfo == null)
{
throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
}
//更新耗卡记录状态
LqhyhkInfo.IsEffective = StatusEnum.无效.GetHashCode();
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1590
1591
|
LqhyhkInfo.UpdateTime = DateTime.Now;
LqhyhkInfo.CancelRemark = remarks;
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1592
1593
1594
1595
1596
1597
1598
|
await _db.Updateable(LqhyhkInfo).ExecuteCommandAsync();
//更新品项明细表状态
await _db.Updateable<LqXhPxmxEntity>().SetColumns(it => new LqXhPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.ConsumeInfoId == id).ExecuteCommandAsync();
//更新健康师业绩表状态
await _db.Updateable<LqXhJksyjEntity>().SetColumns(it => new LqXhJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Glkdbh == id).ExecuteCommandAsync();
//更新科技部老师业绩表状态
await _db.Updateable<LqXhKjbsyjEntity>().SetColumns(it => new LqXhKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Glkdbh == id).ExecuteCommandAsync();
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1599
1600
|
//更新人次记录表状态
await _db.Updateable<LqPersonTimesRecordEntity>().SetColumns(it => new LqPersonTimesRecordEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.BusinessId == id).ExecuteCommandAsync();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
|
//关闭事务
_db.CommitTran();
return LqhyhkInfo;
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1001);
}
}
#endregion
#region 获取某个会员的耗卡记录
/// <summary>
/// 获取某个会员的耗卡记录(分页)
/// </summary>
/// <param name="input">查询参数</param>
/// <returns></returns>
[HttpGet("GetMemberCardUsageRecord")]
public async Task<dynamic> GetMemberCardUsageRecord([FromQuery] LqXhHyhkMemberCardUsageQueryInput input)
{
try
{
// 参数验证
if (string.IsNullOrEmpty(input.MemberId))
{
throw NCCException.Oh("会员ID不能为空");
}
// 分页查询会员耗卡记录
var data = await _db.Queryable<LqXhHyhkEntity>()
.Where(p => p.Hy == input.MemberId && p.IsEffective == StatusEnum.有效.GetHashCode())
.WhereIF(!string.IsNullOrEmpty(input.StoreId), p => p.Md == input.StoreId)
.WhereIF(input.StartTime.HasValue, p => p.Hksj >= input.StartTime.Value)
.WhereIF(input.EndTime.HasValue, p => p.Hksj <= input.EndTime.Value)
.Select(it => new LqXhHyhkMemberCardUsageOutput
{
Id = it.Id,
MemberId = it.Hy,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1640
|
MemberName = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Khmc),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
|
StoreId = it.Md,
StoreName = it.Mdmc,
UsageDate = it.Hksj,
TotalAmount = it.Xfje,
Remarks = it.SignatureFile,
CreateTime = it.CreateTime
})
.MergeTable()
.OrderBy((input.sidx == null ? "UsageDate" : input.sidx) + " " + (input.sort ?? "desc"))
.ToPagedListAsync(input.currentPage, input.pageSize);
// 获取当前页耗卡记录ID,直接查询对应的品项明细
if (data.list.Any())
{
var recordIds = data.list.Select(r => r.Id).ToList();
// 批量查询当前页记录的所有品项明细
var itemDetails = await _db.Queryable<LqXhPxmxEntity>().Where(w => recordIds.Contains(w.ConsumeInfoId) && w.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
// 按耗卡记录ID分组明细
var detailsGrouped = itemDetails.GroupBy(d => d.ConsumeInfoId).ToDictionary(g => g.Key, g => g.ToList());
// 为每个记录添加品项明细
foreach (var record in data.list)
{
if (detailsGrouped.ContainsKey(record.Id))
{
record.ItemDetails = detailsGrouped[record.Id].Select(detail => new LqXhHyhkMemberCardUsageItemDetail
{
Id = detail.Id,
ItemId = detail.Px,
ItemName = detail.Pxmc,
UnitPrice = detail.Pxjg,
ProjectNumber = detail.ProjectNumber,
TotalPrice = detail.TotalPrice,
SourceType = detail.SourceType,
CreateTime = detail.CreateTIme
}).ToList();
}
}
}
return PageResult<LqXhHyhkMemberCardUsageOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
throw NCCException.Oh($"获取会员耗卡记录失败: {ex.Message}");
}
}
#endregion
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
|
#region 同步耗卡数据到人次记录表(同步的时候才用)
/// <summary>
/// 同步耗卡数据到人次记录表(同步的时候才用)
/// </summary>
/// <remarks>
/// 将耗卡记录中的健康师和科技老师业绩数据同步到人次记录表(lq_person_times_record)
///
/// 同步逻辑:
/// 1. 查询所有有效的耗卡记录
/// 2. 对于每条耗卡记录,查询关联的健康师业绩和科技老师业绩
/// 3. 对健康师和科技老师进行去重(按人员ID)
/// 4. 为每个去重后的健康师和科技老师创建人次记录
/// 5. 计算人次数量:1 / 健康师(或科技老师)数量
///
/// 字段映射:
/// - F_BusinessId: 耗卡ID(lq_xh_hyhk.F_Id)
/// - F_BusinessType: "耗卡"
/// - F_PersonType: "健康师" 或 "科技老师"
/// - F_PersonId: 健康师ID(lq_xh_jksyj.jks)或科技老师ID(lq_xh_kjbsyj.kjbls)
/// - F_PersonName: 健康师姓名(lq_xh_jksyj.jksxm)或科技老师姓名(lq_xh_kjbsyj.kjblsxm)
/// - F_MemberId: 客户ID(lq_xh_hyhk.hy)
/// - F_MemberName: 客户姓名(lq_xh_hyhk.hymc)
/// - F_WorkDate: 耗卡时间的日期部分(lq_xh_hyhk.hksj)
/// - F_WorkMonth: 耗卡时间的月份部分,格式:YYYYMM(lq_xh_hyhk.hksj)
/// - F_Quantity: 人次数量 = 1 / 健康师(或科技老师)数量
///
/// 注意事项:
/// - 只同步有效的耗卡记录(F_IsEffective = 1)
/// - 只同步有效的健康师业绩和科技老师业绩(F_IsEffective = 1)
/// - 如果已存在相同业务ID的记录,会先删除再重新插入
/// </remarks>
/// <param name="consumeId">可选,指定耗卡ID,如果为空则同步所有耗卡数据</param>
/// <returns>同步结果,包含同步的记录数</returns>
/// <response code="200">同步成功</response>
/// <response code="500">服务器内部错误</response>
[HttpPost("sync-person-times-record")]
public async Task<dynamic> SyncPersonTimesRecord([FromQuery] string consumeId = null)
{
try
{
_logger.LogInformation($"开始同步耗卡数据到人次记录表,耗卡ID: {consumeId ?? "全部"}");
// 1. 查询耗卡记录
var consumeQuery = _db.Queryable<LqXhHyhkEntity>().Where(x => x.IsEffective == StatusEnum.有效.GetHashCode());
if (!string.IsNullOrEmpty(consumeId))
{
consumeQuery = consumeQuery.Where(x => x.Id == consumeId);
}
var consumeList = await consumeQuery.ToListAsync();
if (!consumeList.Any())
{
return new { success = true, message = "没有需要同步的耗卡记录", count = 0 };
}
_logger.LogInformation($"找到 {consumeList.Count} 条耗卡记录需要同步");
// 2. 批量查询关联数据
var consumeIds = consumeList.Select(x => x.Id).ToList();
// 查询健康师业绩
var jksyjList = await _db.Queryable<LqXhJksyjEntity>().Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
// 查询科技老师业绩
var kjbsyjList = await _db.Queryable<LqXhKjbsyjEntity>().Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
// 查询已存在的人次记录(按BusinessId去重,避免重复添加)
var existingBusinessIds = await _db.Queryable<LqPersonTimesRecordEntity>()
.Where(x => consumeIds.Contains(x.BusinessId) && x.BusinessType == "耗卡" && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => x.BusinessId)
.Distinct()
.ToListAsync();
// 3. 构建人次记录列表
var personTimesRecords = new List<LqPersonTimesRecordEntity>();
foreach (var consume in consumeList)
{
// 如果该耗卡记录已存在,跳过
if (existingBusinessIds.Contains(consume.Id))
{
_logger.LogInformation($"耗卡记录 {consume.Id} 已存在人次记录,跳过");
continue;
}
if (consume.Hksj == null)
{
_logger.LogWarning($"耗卡记录 {consume.Id} 的耗卡时间为空,跳过");
continue;
}
var workDate = consume.Hksj.Value.Date; // 工作日期(用于人次统计)
var workMonth = consume.Hksj.Value.ToString("yyyyMM"); // 工作月份(用于人头统计)
// 处理健康师业绩:去重后计算人次数量(剔除T区健康师)
var consumeJksyjList = jksyjList.Where(x => x.Glkdbh == consume.Id
&& !string.IsNullOrEmpty(x.Jks)
&& !string.IsNullOrEmpty(x.Jksxm)
&& (x.Jksxm == null || !x.Jksxm.Contains("T区"))).ToList();
if (consumeJksyjList.Any())
{
// 按健康师ID去重
var distinctJksyjList = consumeJksyjList
.GroupBy(x => x.Jks)
.Select(g => g.First())
.ToList();
// 计算人次数量:1 / 健康师数量
var jksQuantity = distinctJksyjList.Count > 0 ? 1.0m / distinctJksyjList.Count : 0;
foreach (var jksyj in distinctJksyjList)
{
personTimesRecords.Add(new LqPersonTimesRecordEntity
{
Id = YitIdHelper.NextId().ToString(),
BusinessId = consume.Id,
BusinessType = "耗卡",
PersonType = "健康师",
PersonId = jksyj.Jks,
PersonName = jksyj.Jksxm,
MemberId = consume.Hy,
MemberName = consume.Hymc,
WorkDate = workDate,
WorkMonth = workMonth,
Quantity = jksQuantity,
CreateTime = DateTime.Now,
IsEffective = StatusEnum.有效.GetHashCode()
});
}
}
// 处理科技老师业绩:去重后计算人次数量(剔除T区科技老师)
var consumeKjbsyjList = kjbsyjList.Where(x => x.Glkdbh == consume.Id
&& !string.IsNullOrEmpty(x.Kjbls)
&& !string.IsNullOrEmpty(x.Kjblsxm)
&& (x.Kjblsxm == null || !x.Kjblsxm.Contains("T区"))).ToList();
if (consumeKjbsyjList.Any())
{
// 按科技老师ID去重
var distinctKjbsyjList = consumeKjbsyjList
.GroupBy(x => x.Kjbls)
.Select(g => g.First())
.ToList();
// 计算人次数量:1 / 科技老师数量
var kjbsQuantity = distinctKjbsyjList.Count > 0 ? 1.0m / distinctKjbsyjList.Count : 0;
foreach (var kjbsyj in distinctKjbsyjList)
{
personTimesRecords.Add(new LqPersonTimesRecordEntity
{
Id = YitIdHelper.NextId().ToString(),
BusinessId = consume.Id,
BusinessType = "耗卡",
PersonType = "科技老师",
PersonId = kjbsyj.Kjbls,
PersonName = kjbsyj.Kjblsxm,
MemberId = consume.Hy,
MemberName = consume.Hymc,
WorkDate = workDate,
WorkMonth = workMonth,
Quantity = kjbsQuantity,
CreateTime = DateTime.Now,
IsEffective = StatusEnum.有效.GetHashCode()
});
}
}
}
// 4. 使用事务保存数据
var result = await _db.Ado.UseTranAsync(async () =>
{
// 如果指定了耗卡ID,删除该耗卡的旧记录(用于重新同步)
// 如果没有指定耗卡ID,不删除任何记录(因为已经在构建记录列表时跳过了已存在的记录)
if (!string.IsNullOrEmpty(consumeId))
{
await _db.Deleteable<LqPersonTimesRecordEntity>()
.Where(x => x.BusinessId == consumeId && x.BusinessType == "耗卡")
.ExecuteCommandAsync();
}
// 批量插入新记录
if (personTimesRecords.Any())
{
// 分批插入,每批1000条
var batchSize = 1000;
for (int i = 0; i < personTimesRecords.Count; i += batchSize)
{
var batch = personTimesRecords.Skip(i).Take(batchSize).ToList();
await _db.Insertable(batch).ExecuteCommandAsync();
}
}
return personTimesRecords.Count;
});
if (result.IsSuccess)
{
_logger.LogInformation($"同步完成,共同步 {result.Data} 条人次记录");
return new { success = true, message = "同步成功", count = result.Data };
}
else
{
_logger.LogError($"同步失败: {result.ErrorMessage}");
throw NCCException.Oh(ErrorCode.COM1000, $"同步失败: {result.ErrorMessage}");
}
}
catch (Exception ex)
{
_logger.LogError(ex, $"同步耗卡数据到人次记录表失败: {ex.ToString()}");
throw NCCException.Oh(ErrorCode.COM1005, $"同步耗卡数据到人次记录表失败: {ex.Message}");
}
}
#endregion
|
96009bc9
hexiaodong
hxd
|
1897
1898
|
}
}
|