admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file1 bug fixed - merge from fil-bug-fix brach

Browse Source
This commit is contained in:
SamSys
2025-04-13 23:41:09 +03:30
parent 7e35f8009a 252c601eb4
commit fa587c61eb
5 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Company.Domain/File1/IFileRepository.cs
View File

@@ -16,4 +16,10 @@ public interface IFileRepository : IRepository<long, File1>
string GetEmployerFullNameById(long id);
List<EmployeeViewModel> GetAllEmploees();
List<EmployerViewModel> GetAllEmployers();
#region Mahan
List<FileViewModel> GetFileList(FileSearchModel searchModel);
#endregion
}

3
CompanyManagment.App.Contracts/File1/FileSearchModel.cs
View File

@@ -40,6 +40,9 @@ public class FileSearchModel
public bool IsSearch { get; set; }
public int PageIndex { get; set; }
}

71
CompanyManagment.EFCore/Repository/FileRepository.cs
View File

@@ -96,24 +96,24 @@ public class FileRepository : RepositoryBase<long, Company.Domain.File1.File1>,
query = query.Where(x => x.ArchiveNo == int.Parse(searchModel.ArchiveNo));
}
if(!string.IsNullOrEmpty(searchModel.FileClass) && searchModel.FileClass != "-1")
if (!string.IsNullOrEmpty(searchModel.FileClass) && searchModel.FileClass != "-1")
{
query = query.Where(x => x.FileClass.Contains(searchModel.FileClass));
}
if(searchModel.UserId != 0)
if (searchModel.UserId != 0)
{
if (searchModel.Client == 0)
query = query.Where(x => x.Reqester == searchModel.UserId || x.Summoned == searchModel.UserId);
else if (searchModel.Client == 1)
query = query.Where(x => x.Reqester == searchModel.UserId);
else
query = query.Where(x => x.Summoned == searchModel.UserId);
}
if(searchModel.Status != 0)
if (searchModel.Status != 0)
{
query = query.Where(x => x.Status == searchModel.Status);
}
@@ -240,7 +240,7 @@ public class FileRepository : RepositoryBase<long, Company.Domain.File1.File1>,
//return result;
}
public long FindLastArchiveNumber()
{
var checkExist = _context.Files.Any();
@@ -261,17 +261,17 @@ public class FileRepository : RepositoryBase<long, Company.Domain.File1.File1>,
EmployeeFullName = x.FName + " " + x.LName
}).FirstOrDefault();
return result.EmployeeFullName;
return result?.EmployeeFullName??"";
}
public string GetEmployerFullNameById(long id)
{
var result = _context.Employers.Where(x=>x.id == id).Select(x => new EmployerViewModel()
var result = _context.Employers.Where(x => x.id == id).Select(x => new EmployerViewModel()
{
FullName = x.FullName
}).FirstOrDefault();
return result.FullName;
return result?.FullName??"";
}
public List<EmployeeViewModel> GetAllEmploees()
@@ -308,4 +308,57 @@ public class FileRepository : RepositoryBase<long, Company.Domain.File1.File1>,
}).ToList();
}
public List<FileViewModel> GetFileList(FileSearchModel searchModel)
{
var query = _context.Files.Select(x => new FileViewModel
{
Id = x.id,
ArchiveNo = x.ArchiveNo,
ClientVisitDate = x.ClientVisitDate.ToFarsi(),
ProceederReference = x.ProceederReference,
Reqester = x.Reqester,
Summoned = x.Summoned,
Client = x.Client,
FileClass = x.FileClass,
HasMandate = x.HasMandate,
Description = x.Description,
Status = x.Status
});
if (searchModel.Id != 0)
{
query = query.Where(x => x.Id == searchModel.Id);
}
//TODO if
if (searchModel.ArchiveNo != null && int.Parse(searchModel.ArchiveNo) != -1)
{
query = query.Where(x => x.ArchiveNo == int.Parse(searchModel.ArchiveNo));
}
if (!string.IsNullOrEmpty(searchModel.FileClass) && searchModel.FileClass != "-1")
{
query = query.Where(x => x.FileClass.Contains(searchModel.FileClass));
}
if (searchModel.UserId != 0)
{
if (searchModel.Client == 0)
query = query.Where(x => x.Reqester == searchModel.UserId || x.Summoned == searchModel.UserId);
else if (searchModel.Client == 1)
query = query.Where(x => x.Reqester == searchModel.UserId);
else
query = query.Where(x => x.Summoned == searchModel.UserId);
}
if (searchModel.Status != 0)
{
query = query.Where(x => x.Status == searchModel.Status);
}
return query.OrderByDescending(x => x.ArchiveNo).Skip(searchModel.PageIndex).Take(30).ToList();
}
}

5
ServiceHost/Areas/Admin/Pages/Company/FilePage/Index.cshtml
View File

@@ -313,6 +313,7 @@
{
var background = "";
var status = 0;
var activationStatus = 0;
var style = "";
var exitStyle = "";
if (item.HasMandate == 1)
@@ -934,12 +935,12 @@
@if (item.Status == FileEnums.DEACTIVE)
{
style = "background-color: #fff; border-color: #ef5350; color: #ef5350 !important";
status = FileEnums.DEACTIVE;
status = FileEnums.ACTIVE;
}
else
{
style = "background-color: #ef5350; border-color: #ef5350;";
status = FileEnums.ACTIVE;
status = FileEnums.DEACTIVE;
}
<a title="@(item.Status == FileEnums.DEACTIVE ? "فعال کردن پرونده" : "غیرفعال کردن پرونده")" class="btn btn-danger ionRad" onclick="setFileStatus(@item.Id, @status)" style="@style">
<i class="ion-briefcase ionSize"></i>

3
ServiceHost/Areas/Admin/Pages/Company/FilePage/Index.cshtml.cs
View File

@@ -101,7 +101,8 @@ public class IndexModel : PageModel
{
ArchiveNo_FileClass_UserIdList = allFiles.Select(x => new ArchiveNo_FileClass_UserIdList
{
ArchiveNo = x.ArchiveNo.ToString(), FileClass = x.FileClass,
ArchiveNo = x.ArchiveNo.ToString(),
FileClass = x.FileClass,
UserId = x.Client == 1 ? x.Reqester : x.Summoned
}).ToList(),
UsersList = _fileApplication.GetAllEmploees().Select(x => new Users