Commit 9c7c862b by lcx

5.1清除数据 、 特殊核算sheet无合并单元格,跳过合并插入

parent 62c730d3
......@@ -531,6 +531,9 @@ public string AlllotExecute(string email, sys_hospital hospital, List<sys_hospit
ClearData(sheet, 2, 3, endCellNum: 4);
SupplySpecialUnit(sheet, sheetRead, specials, extracts, lastAllot, false);
break;
case SheetType.AccountExtra:
ClearData(sheet, 2, 3);
break;
}
logManage.ReturnTheLog(Allot.ID, GroupName, 2, "写入数据", $"sheet“{sheet.SheetName}”已完成数据写入");
}
......@@ -586,8 +589,8 @@ private List<ex_result> QueryData(sys_hospitalconfig config, per_allot allot, st
CreateTime = CreateTime,
}).ToList();
}
return data;
}
return data;
}
/// <summary>
......@@ -1574,7 +1577,7 @@ private void WriteSpecialCellValue(Dictionary<string, Func<ex_special, List<im_s
int index = beginrow ?? merges.Min(t => t.FirstRow);
for (int i = index; i < sheet.LastRowNum + 1; i++)
{
if (!merges.Any(t => i >= t.FirstRow && i <= t.LastRow))
if (merges.Count > 0 && !merges.Any(t => i >= t.FirstRow && i <= t.LastRow))
{
string value = "";
var firstrow = sheet.GetRow(i);
......
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