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

merge from CreateEmployeeBug

Browse Source
This commit is contained in:
MahanCh
2025-07-15 11:08:40 +03:30
parent aab30b3a4b 94058660b6
commit 8f8a971a41
3 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
View File

@@ -13,7 +13,8 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
EditInstitutionContract GetDetails(long id);
EditInstitutionContract GetFirstContract(long contractingPartyId, string typeOfContract);
List<InstitutionContractViewModel> InstitutionContractsWithoutAccount();
List<InstitutionContractViewModel> ContractWithoutValidContactInfo();
List<InstitutionContractViewModel> Search(InstitutionContractSearchModel searchModel);
List<InstitutionContractViewModel> NewSearch(InstitutionContractSearchModel searchModel);
List<InstitutionContractViewModel> PrintAll(List<long> id);

75
CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using _0_Framework.Application;
using _0_Framework.InfraStructure;
using Company.Domain.ContractingPartyAccountAgg;
@@ -100,7 +101,81 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
.Where(x => x.ContractingPartyId == contractingPartyId && x.TypeOfContract == typeOfContract).OrderBy(x => x.ExtensionNo).FirstOrDefault();
}
public List<InstitutionContractViewModel> InstitutionContractsWithoutAccount()
{
var now = DateTime.Now;
var contractHasClientAccountList = _context.InstitutionContractSet.AsSplitQuery().Where(x => x.IsActiveString == "true" && x.ContractStartGr <= now && x.ContractEndGr >= now)
.Join(_context.ContractingPartyAccounts,
contract => contract.ContractingPartyId,
acc => acc.PersonalContractingPartyId,
((contract, account) => new {contract, account})).Select(x=>x.contract);
var allActiveContracts = _context.InstitutionContractSet.Where(x =>
x.IsActiveString == "true" && x.ContractStartGr <= now && x.ContractEndGr >= now);
var contractWithoutAccountList = allActiveContracts.Except(contractHasClientAccountList);
return contractWithoutAccountList.Select(x => new InstitutionContractViewModel
{
Id = x.id,
ContractNo = x.ContractNo,
ContractStartGr = x.ContractStartGr,
ContractStartFa = x.ContractStartFa,
ContractEndGr = x.ContractEndGr,
ContractEndFa = x.ContractEndFa,
RepresentativeId = x.RepresentativeId,
RepresentativeName = x.RepresentativeName,
ContractingPartyName = x.ContractingPartyName,
ContractingPartyId = x.ContractingPartyId,
ContractAmount = x.ContractAmount.ToMoney(),
TotalAmount = x.TotalAmount.ToMoney(),
SearchAmount = x.ContractAmount,
IsActiveString = x.IsActiveString,
OfficialCompany = x.OfficialCompany,
TypeOfContract = x.TypeOfContract,
}).ToList();
}
public List<InstitutionContractViewModel> ContractWithoutValidContactInfo()
{
var now = DateTime.Now;
var contractHasContactInfo = _context.InstitutionContractSet.AsSplitQuery().Where(x => x.IsActiveString == "true" && x.ContractStartGr <= now && x.ContractEndGr >= now)
.Join(_context.InstitutionContractContactInfos,
contract => contract.id,
contactInfo => contactInfo.InstitutionContractId,
((contract, contactInfo) => new { contract, contactInfo }))
.Where(x => x.contactInfo.SendSms && x.contactInfo.Position == "طرف قرارداد" && x.contactInfo.PhoneType == "شماره همراه")
.Select(x => x.contract);
var allvalidCcntactInfoContracts = _context.InstitutionContractSet.Where(x =>
x.IsActiveString == "true" && x.ContractStartGr <= now && x.ContractEndGr >= now);
var contractWithoutAccountList = allvalidCcntactInfoContracts.Except(contractHasContactInfo);
return contractWithoutAccountList.Select(x => new InstitutionContractViewModel
{
Id = x.id,
ContractNo = x.ContractNo,
ContractStartGr = x.ContractStartGr,
ContractStartFa = x.ContractStartFa,
ContractEndGr = x.ContractEndGr,
ContractEndFa = x.ContractEndFa,
RepresentativeId = x.RepresentativeId,
RepresentativeName = x.RepresentativeName,
ContractingPartyName = x.ContractingPartyName,
ContractingPartyId = x.ContractingPartyId,
ContractAmount = x.ContractAmount.ToMoney(),
TotalAmount = x.TotalAmount.ToMoney(),
SearchAmount = x.ContractAmount,
IsActiveString = x.IsActiveString,
OfficialCompany = x.OfficialCompany,
TypeOfContract = x.TypeOfContract,
}).ToList();
}
public List<InstitutionContractViewModel> Search(InstitutionContractSearchModel searchModel)
{
//var stored = _context.InstitutionContractSet.FromSqlInterpolated($"SelectQuery_InstitutionContract").AsNoTracking()

7
ServiceHost/wwwroot/AssetsClient/pages/Employees/js/IdentityInformationModal.js
View File

@@ -84,7 +84,7 @@ function checkNationalCode(nationalCode, birthDate) {
$("#IdentityLoading").show();
$.ajax({
//async: false,
async: false,
url: checkNationalUrl,
method: "GET",
data: { nationalCode: nationalCode, birthDate: birthDate },
@@ -114,7 +114,7 @@ function checkNationalCode(nationalCode, birthDate) {
} else {
$("#NationalitySelect").val(response.data.nationality).trigger('change');
}
if (response.data.gender === "مرد") {
$("#gender1").prop("checked", true);
} else if (response.data.gender === "زن") {
@@ -181,9 +181,8 @@ function checkNationalCode(nationalCode, birthDate) {
$("#IdentityLoading").hide();
}
}
else if (response.data.authorizedCanceled) {
else if (response.data?.authorizedCanceled) {
$(".checkByHistoryCode2").removeClass("disable");
$("#AuthorizedCanceled").removeClass("disable");