|
@@ -29,9 +29,7 @@ func ImportXLSX(filename string) []*PlanXLSX {
|
|
|
|
|
|
sheet.ForEachRow(func(row *Row) error {
|
|
|
splited := strings.Split(row.Cells[1].String(), ".")
|
|
|
- if i >= 20 && len(row.Cells) >= 20 && len(row.Cells)>=20 && !(row.Cells[2].String() == "" || row.Cells[2].String() == "ИТОГО")
|
|
|
- && !(strings.HasPrefix(row.Cells[1].String(), "Консультации") || strings.HasPrefix(row.Cells[1].String(), "Государственная"))
|
|
|
- && len(splited) == 2{
|
|
|
+ if i >= 20 && len(row.Cells) >= 20 && len(row.Cells)>=20 && !(row.Cells[2].String() == "" || row.Cells[2].String() == "ИТОГО") && !(strings.HasPrefix(row.Cells[1].String(), "Консультации") || strings.HasPrefix(row.Cells[1].String(), "Государственная")) && len(splited) == 2{
|
|
|
typerow := TypeRow(IsSubTR)
|
|
|
switch {
|
|
|
case strings.Contains(row.Cells[2].String(), "цикл"):
|