|
|
|
@ -1,4 +1,6 @@ |
|
|
|
using System; |
|
|
|
using System.Collections.Generic; |
|
|
|
using System.Linq; |
|
|
|
using System.Text.Json; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using Microsoft.AspNetCore.Mvc; |
|
|
|
@ -70,13 +72,13 @@ public class JobController : AbpController |
|
|
|
/// 获取全部任务数量统计
|
|
|
|
/// </summary>
|
|
|
|
/// <returns></returns>
|
|
|
|
[HttpGet("{isToday}")] |
|
|
|
public virtual async Task<ListResultDto<JobCountDto>> CountAsync(bool isToday) |
|
|
|
[HttpGet("get-job-count/{isToday}")] |
|
|
|
public virtual async Task<ListResultDto<JobCountDto>> CountAsync(Guid userId ,bool isToday) |
|
|
|
{ |
|
|
|
var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); |
|
|
|
var jsonCodes = JsonSerializer.Serialize(wlgCodes); |
|
|
|
var wlgCodes = await _userWorkGroupAppService.GetUserWorkGroupAsync(userId).ConfigureAwait(false); |
|
|
|
var jsonCodes = JsonSerializer.Serialize(wlgCodes.Select(p=>p.WorkGroupCode)); |
|
|
|
|
|
|
|
var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; |
|
|
|
var status = new List<EnumJobStatus>() { EnumJobStatus.Open,EnumJobStatus.Doing }; |
|
|
|
var jsonStatus = JsonSerializer.Serialize(status); |
|
|
|
|
|
|
|
var list = new List<JobCountDto>(); |
|
|
|
@ -162,6 +164,8 @@ public class JobController : AbpController |
|
|
|
purchaseReceiptJobRequest.Condition.Filters.Add(new Filter(nameof(PurchaseReceiptJobDTO.PlanArriveDate), Clock.Now.ToString("yyyy-MM-dd"), ">=", "And")); |
|
|
|
purchaseReceiptJobRequest.Condition.Filters.Add(new Filter(nameof(PurchaseReceiptJobDTO.PlanArriveDate), Clock.Now.AddDays(1).ToString("yyyy-MM-dd"), "<=", "And")); |
|
|
|
} |
|
|
|
var purchaseReceiptJobs = await _purchaseReceiptJobAppService.GetCountByFilterAsync(purchaseReceiptJobRequest).ConfigureAwait(false); |
|
|
|
list.Add(new JobCountDto { JobType = EnumJobType.PurchaseReceiptJob, Count = purchaseReceiptJobs }); |
|
|
|
|
|
|
|
var purchaseReturnJobs = await _purchaseReturnJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase |
|
|
|
{ |
|
|
|
|
