Commit d7397aba by ruyun.zhang

忽略列头修改

parent 2197f5ed
......@@ -15,6 +15,7 @@
using Performance.Repository;
using static Performance.Services.ExtractExcelService.WriteDataHelper;
using System.Drawing;
using Microsoft.Extensions.Configuration;
namespace Performance.Services
{
......@@ -54,7 +55,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
RealGiveFee = 0,
};
var ignore = new string[] { "合计", "汇总", "总计" };
var ignore = _configuration.GetSection("UniteDeptDetailIgnore").Get<string[]>() ?? Array.Empty<string>();
var persheet = _perforPerSheetRepository.GetEntities(t => t.AllotID == allotId) ?? new List<per_sheet>();
var headers = _perforImheaderRepository.GetEntities(t => t.AllotID == allotId) ?? new List<im_header>();
var basicData = _perforImDataRepository.GetEntities(t => t.AllotID == allotId && t.AccountingUnit == accountingUnit) ?? new List<im_data>();
......@@ -493,7 +494,7 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
var allot = perforPerallotRepository.GetEntity(t => t.ID == allotId);
if (allot == null) throw new PerformanceException("绩效月信息错误");
var ignore = new string[] { "合计", "汇总", "总计" };
var ignore = _configuration.GetSection("UniteDeptDetailIgnore").Get<string[]>() ?? Array.Empty<string>();
var persheet = _perforPerSheetRepository.GetEntities(t => t.AllotID == allotId) ?? new List<per_sheet>();
var headers = _perforImheaderRepository.GetEntities(t => t.AllotID == allotId) ?? new List<im_header>();
var basicData = _perforImDataRepository.GetEntities(t => t.AllotID == allotId) ?? new List<im_data>();
......
......@@ -4,6 +4,7 @@
using System.Linq.Expressions;
using System.Text.RegularExpressions;
using AutoMapper;
using Microsoft.Extensions.Configuration;
using Performance.DtoModels;
using Performance.DtoModels.Request;
using Performance.EntityModels;
......@@ -16,6 +17,7 @@ namespace Performance.Services
public partial class ComputeService : IAutoInjection
{
private readonly IMapper _mapper;
private readonly IConfiguration _configuration;
private readonly PerforUserRepository _userRepository;
private readonly PerforResaccountRepository perforResaccountRepository;
private readonly PerforPersheetRepository _perforPerSheetRepository;
......@@ -42,6 +44,7 @@ public partial class ComputeService : IAutoInjection
public ComputeService(
IMapper mapper,
IConfiguration configuration,
PerforUserRepository userRepository,
PerforResaccountRepository perforResaccountRepository,
PerforPersheetRepository perforPerSheetRepository,
......@@ -67,6 +70,7 @@ public partial class ComputeService : IAutoInjection
PerforCofDeptDetailRepository perforCofDeptDetailRepository)
{
_mapper = mapper;
_configuration = configuration;
_userRepository = userRepository;
this.perforResaccountRepository = perforResaccountRepository;
this._perforPerSheetRepository = perforPerSheetRepository;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment