XCKJ/EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

上线前 整理代码

Browse Source
This commit is contained in:
hang
2022-06-01 10:01:57 +08:00
parent 7ace793235
commit bd44ac3b2c
20 changed files with 183 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
+2
View File
@@ -179,6 +179,8 @@ namespace IRaCIS.Application.Contracts
public string Code { get; set; } = String.Empty;
public string FirstName { get; set; } = String.Empty;
public string LastName { get; set; } = String.Empty;
public string FullName { get; set; } = String.Empty;
public string ChineseName { get; set; } = String.Empty;
public DateTime? EnrollTime { get; set; }
IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
+40 -36
View File
@@ -1,13 +1,12 @@
using AutoMapper;
using IRaCIS.Core.Infrastructure.ExpressionExtend;
using IRaCIS.Application.Contracts;
using IRaCIS.Core.Infra.EFCore;
using IRaCIS.Core.Domain.Share;
using System.Linq.Expressions;
using IRaCIS.Core.Application.Filter;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using IRaCIS.Core.Application.Auth;
using System.Linq.Dynamic.Core;
namespace IRaCIS.Application.Services
{
@@ -154,6 +153,8 @@ namespace IRaCIS.Application.Services
Code = doctor.ReviewerCode,
FirstName = doctor.FirstName,
LastName = doctor.LastName,
FullName=doctor.FullName,
ChineseName = doctor.ChineseName,
OutEnrollTime = intoGroup.OutEnrollTime,
@@ -178,41 +179,44 @@ namespace IRaCIS.Application.Services
};
var count = await doctorIntoGroupQueryable.CountAsync();
if (string.IsNullOrWhiteSpace(doctorSearchModel.SortField))
{
doctorIntoGroupQueryable = doctorIntoGroupQueryable.OrderByDescending("EnrollTime").ThenBy(u => u.Code);
}
else
{
if (doctorSearchModel.SortField == "FirstName" || doctorSearchModel.SortField == "LastName")
{
if (doctorSearchModel.Asc)
{
doctorIntoGroupQueryable = doctorIntoGroupQueryable.OrderBy("LastName").ThenBy(u => u.FirstName);
}
else
{
doctorIntoGroupQueryable = doctorIntoGroupQueryable.OrderByDescending("LastName").ThenByDescending(u => u.FirstName);
}
}
else
{
var propName = doctorSearchModel.SortField == "" ? "EnrollTime" : doctorSearchModel.SortField;
doctorIntoGroupQueryable = doctorSearchModel.Asc
? doctorIntoGroupQueryable.OrderBy(propName)
: doctorIntoGroupQueryable.OrderByDescending(propName);
}
}
//分页
doctorIntoGroupQueryable = doctorIntoGroupQueryable
.Skip((doctorSearchModel.PageIndex - 1) * doctorSearchModel.PageSize)
.Take(doctorSearchModel.PageSize);
//从数据库提取数据
var intoGroupList = doctorIntoGroupQueryable.ToList();
return await doctorIntoGroupQueryable.ToPagedListAsync(doctorSearchModel.PageIndex, doctorSearchModel.PageSize, doctorSearchModel.SortField == "" ? "EnrollTime" : doctorSearchModel.SortField, doctorSearchModel.Asc);
return new PageOutput<WorkLoadAndAgreementDTO>(doctorSearchModel.PageIndex,
doctorSearchModel.PageSize, count, intoGroupList);
//var count = await doctorIntoGroupQueryable.CountAsync();
//if (string.IsNullOrWhiteSpace(doctorSearchModel.SortField))
//{
// doctorIntoGroupQueryable = doctorIntoGroupQueryable.OrderByDescending("EnrollTime").ThenBy(u => u.Code);
//}
//else
//{
// if (doctorSearchModel.SortField == "FirstName" || doctorSearchModel.SortField == "LastName")
// {
// if (doctorSearchModel.Asc)
// {
// doctorIntoGroupQueryable = doctorIntoGroupQueryable.OrderBy("LastName").ThenBy(u => u.FirstName);
// }
// else
// {
// doctorIntoGroupQueryable = doctorIntoGroupQueryable.OrderByDescending("LastName").ThenByDescending(u => u.FirstName);
// }
// }
// else
// {
// var propName = doctorSearchModel.SortField == "" ? "EnrollTime" : doctorSearchModel.SortField;
// doctorIntoGroupQueryable = doctorSearchModel.Asc
// ? doctorIntoGroupQueryable.OrderBy(propName)
// : doctorIntoGroupQueryable.OrderBy(propName + " desc");
// }
//}
////分页
//doctorIntoGroupQueryable = doctorIntoGroupQueryable
// .Skip((doctorSearchModel.PageIndex - 1) * doctorSearchModel.PageSize)
// .Take(doctorSearchModel.PageSize);
////从数据库提取数据
//var intoGroupList = doctorIntoGroupQueryable.ToList();
//return new PageOutput<WorkLoadAndAgreementDTO>(doctorSearchModel.PageIndex,
// doctorSearchModel.PageSize, count, intoGroupList);
}