|
@@ -202,13 +202,9 @@ class ExcelUtil:
|
|
|
rows = [row for row in work_sheet.rows][1:]
|
|
|
info = {}
|
|
|
for row in rows:
|
|
|
- question_value = row[2].value
|
|
|
- sub_option_value = row[9].value
|
|
|
- name = row[12].value
|
|
|
- if (question_value != '占位题' or str(sub_option_value).find('占位') != -1) and name is not None and str(name).find('占位') != -1:
|
|
|
- key = str(int(row[1].value)) + str(int(row[9].value))
|
|
|
- # 数据类型,数据项名称,所在tab
|
|
|
- info[key] = [row[15].value, row[13].value, row[14].value]
|
|
|
+ key = str(int(row[1].value)) + str(int(row[9].value))
|
|
|
+ # 数据类型,数据项名称,所在tab
|
|
|
+ info[key] = [row[15].value, row[13].value, row[14].value]
|
|
|
return info
|
|
|
|
|
|
|