diff --git a/Cigarette/jinye_scraper.py b/Cigarette/jinye_scraper.py index 66fb648..94c0578 100644 --- a/Cigarette/jinye_scraper.py +++ b/Cigarette/jinye_scraper.py @@ -139,9 +139,10 @@ def write_cell(ws, row: int, col: int, value): cell = ws.cell(row, col) if col == FORMULA_COL: - cell.value = (f'=IF(AND(F{row}>=16,F{row}<18),"细支",' + cell.value = (f'=IF(ISNUMBER(FIND("雪茄",B{row})),"雪茄",' + f'=IF(AND(F{row}>=16,F{row}<=18),"细支",' f'IF(AND(F{row}>=19,F{row}<=22),"中支",' - f'IF(AND(F{row}>=23,F{row}<25),"粗支","非常规")))') + f'IF(AND(F{row}>=23,F{row}<=25),"粗支","非常规")))') return if col == DATE_COL and value and str(value).strip():