Commit 0e43e273 by lcx

特殊核算单元新增合并列

parent 388ed038
......@@ -17,5 +17,9 @@ public class SpecialUnitColumns
public const string TargetFactor = "量化指标绩效分值";
public const string AdjustFactor = "调节系数";
public const string AssessBefore = "考核前绩效";
public const string Avg = "人均";
}
}
......@@ -320,7 +320,14 @@ private void AddMergedRegion(ISheet sheet, List<SpecialCellRange> ranges, List<s
if (columns == null || !columns.Any()) return;
if (ranges == null || !ranges.Any()) return;
var columnIndexs = new string[] { SpecialUnitColumns.Department, SpecialUnitColumns.PeopleNumber, SpecialUnitColumns.AdjustFactor }.Select(t => columns.IndexOf(t));
var columnIndexs = new string[]
{
SpecialUnitColumns.Department,
SpecialUnitColumns.PeopleNumber,
SpecialUnitColumns.AdjustFactor,
SpecialUnitColumns.AssessBefore,
SpecialUnitColumns.Avg
}.Select(t => columns.IndexOf(t));
if (columnIndexs == null || !columnIndexs.Any(t => t > -1)) return;
foreach (var index in columnIndexs.Where(t => t > -1))
......
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