From db51d0b8503b48ec28c6c5abd2dd70b1cd8c1dff Mon Sep 17 00:00:00 2001 From: timxx <3337598077@qq.com> Date: Sat, 1 Aug 2026 16:38:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Cigarette/jinye=5Fscraper.?= =?UTF-8?q?py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cigarette/jinye_scraper.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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():