From 52976343f79d89454d8d5445a1cc425ac8568f14 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 25 Jul 2023 08:52:07 +0900 Subject: [PATCH] =?UTF-8?q?feat:=201=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97?= =?UTF-8?q?=E8=BE=BA=E3=81=AE=E5=88=86=E5=89=B2=E6=95=B0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/model/view/bio_view_model.py | 11 ++++++----- ecs/jskult-webapp/src/system_var/constants.py | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ecs/jskult-webapp/src/model/view/bio_view_model.py b/ecs/jskult-webapp/src/model/view/bio_view_model.py index 080149de..5c0cd4d7 100644 --- a/ecs/jskult-webapp/src/model/view/bio_view_model.py +++ b/ecs/jskult-webapp/src/model/view/bio_view_model.py @@ -9,7 +9,7 @@ from src.model.db.pharmacy_product_master import PharmacyProductMasterModel from src.model.db.wholesaler_master import WholesalerMasterModel from src.model.request.bio import BioModel from src.model.view.bio_disp_model import BisDisplayModel -from src.system_var import constants, environment +from src.system_var import environment class BioViewModel(BaseModel): @@ -51,16 +51,17 @@ class BioViewModel(BaseModel): ) def bio_data_json_str(self): + """生物由来ロット分解データの検索結果を指定された件数ごとに分割しながら返す""" def date_handler(obj): """json.dumpsの日付項目のフォーマットハンドラ""" return obj.isoformat() if hasattr(obj, 'isoformat') else obj search_data_list = [model.dict() for model in self.bio_data] search_data_len = len(search_data_list) - # 1ページあたりの表示件数単位で、リストにPUSH - part_page_size = constants.BIO_SEARCH_LIST_PAGE_SIZE - for i in range(0, search_data_len, part_page_size): - yield json.dumps(search_data_list[i:i + part_page_size], ensure_ascii=False, default=date_handler) + # 呼び出し一回あたりの分割数 + part_size = 500 + for i in range(0, search_data_len, part_size): + yield json.dumps(search_data_list[i:i + part_size], ensure_ascii=False, default=date_handler) def make_whs_name(self): if not self.is_form_submitted(): diff --git a/ecs/jskult-webapp/src/system_var/constants.py b/ecs/jskult-webapp/src/system_var/constants.py index fbcb1016..d5d4eaea 100644 --- a/ecs/jskult-webapp/src/system_var/constants.py +++ b/ecs/jskult-webapp/src/system_var/constants.py @@ -7,7 +7,6 @@ DUMP_STATUS_UNPROCESSED = '0' # 生物由来照会 -BIO_SEARCH_LIST_PAGE_SIZE = 100 BIO_TEMPORARY_FILE_DIR_PATH = path.join(path.curdir, 'src', 'data') BIO_EXCEL_TEMPLATE_FILE_PATH = path.join(BIO_TEMPORARY_FILE_DIR_PATH, 'BioData_template.xlsx')