|
@@ -26,12 +26,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
{
|
|
{
|
|
private readonly IMapper _mapper;
|
|
private readonly IMapper _mapper;
|
|
private readonly SetDataRepository _setDataRep;
|
|
private readonly SetDataRepository _setDataRep;
|
|
|
|
+ private readonly DelegationInfoRepository _groupRep;
|
|
|
|
|
|
- public EnterExitCostRepository(SqlSugarClient sqlSugar, IMapper mapper, SetDataRepository setDataRep)
|
|
|
|
|
|
+ public EnterExitCostRepository(SqlSugarClient sqlSugar, IMapper mapper, SetDataRepository setDataRep, DelegationInfoRepository groupRep)
|
|
: base(sqlSugar)
|
|
: base(sqlSugar)
|
|
{
|
|
{
|
|
_setDataRep = setDataRep;
|
|
_setDataRep = setDataRep;
|
|
- _mapper = mapper;
|
|
|
|
|
|
+ _mapper = mapper;
|
|
|
|
+ _groupRep = groupRep;
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -295,6 +297,15 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
.ToArrayAsync();
|
|
.ToArrayAsync();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ int provinceId = 122;
|
|
|
|
+ var groupNames = await _groupRep.EnterExitCostGroupNameInfoAsync(dto.DiId);
|
|
|
|
+ if (groupNames!=null)
|
|
|
|
+ {
|
|
|
|
+ provinceId = groupNames.ProvinceId;
|
|
|
|
+ }
|
|
|
|
+ enterExitCostInfoView.ProvinceId = provinceId;
|
|
|
|
+
|
|
|
|
+
|
|
//enterExitCostInfoView.FirstItemRemark = enterExitCostData.Remark;
|
|
//enterExitCostInfoView.FirstItemRemark = enterExitCostData.Remark;
|
|
var dayAndCostSql = string.Format(@"Select ntf.Country,ntf.City,ssd.Name CurremcyCode,ssd.Remark CurrencyName,gdac.* From Grp_DayAndCost gdac
|
|
var dayAndCostSql = string.Format(@"Select ntf.Country,ntf.City,ssd.Name CurremcyCode,ssd.Remark CurrencyName,gdac.* From Grp_DayAndCost gdac
|
|
Left Join Grp_NationalTravelFee ntf On ntf.Id = gdac.NationalTravelFeeId
|
|
Left Join Grp_NationalTravelFee ntf On ntf.Id = gdac.NationalTravelFeeId
|