From b497a7b254a79fbd292b62f4df59a6e0f77cbb5d Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 4 Aug 2023 10:43:37 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=BC=8F=E3=82=8C?= =?UTF-8?q?=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F=E3=81=9F=E3=82=81=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/view/ultmarc_doctor_info_view_model.py | 16 ++++++++-------- .../ultmarc_dr_wrkplace_his_repository.py | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py index cb29e9cd..a92ea9e1 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py @@ -46,14 +46,14 @@ class UltmarcDoctorInfoViewModel(BaseModel): return self._format_date_string(self.doctor_info_data.birthday) # 開始年月日 - def is_input_aply_start_ymd_format(self, date_string): - if date_string: - return self._format_date(date_string) + def is_input_aply_start_ymd_format(self, aply_start_date: datetime): + if aply_start_date: + return self._format_date(aply_start_date) else: return '' # 医師勤務先履歴_開始年月日 - def is_input_his_aply_start_ymd_format(self, aply_start_date_string): + def is_input_his_aply_start_ymd_format(self, aply_start_date_string: str): if aply_start_date_string: # 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す aply_start_date = datetime.strptime(aply_start_date_string, '%Y%m%d') @@ -62,7 +62,7 @@ class UltmarcDoctorInfoViewModel(BaseModel): return '' # 医師勤務先履歴_終了年月日 - def is_input_his_aply_end_ymd_format(self, aply_end_date_string): + def is_input_his_aply_end_ymd_format(self, aply_end_date_string: str): if aply_end_date_string: # 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す aply_end_date = datetime.strptime(aply_end_date_string, '%Y%m%d') @@ -85,13 +85,13 @@ class UltmarcDoctorInfoViewModel(BaseModel): def is_data_overflow_max_length(self): return len(self.doctor_data) > environment.ULTMARC_SEARCH_RESULT_MAX_COUNT - def _format_date_string(self, date_string): - if date_string is None: + def _format_date_string(self, date_string: str) -> str: + if date_string is None or date_string == '': return '' date_str = datetime.strptime(date_string, '%Y%m%d') return date_str.strftime('%Y/%m/%d') - def _format_date(self, date_time): + def _format_date(self, date_time: datetime) -> str: if date_time is None: return '' return date_time.strftime('%Y/%m/%d') diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py index daa82533..054c9d74 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py @@ -17,12 +17,12 @@ class UltmarcDoctorWrkplaceHisRepository(BaseRepository): post.form_post_name as post_name, com_dr_wrkplace_his.aply_start_ymd, com_dr_wrkplace_his.aply_end_ymd - FROM com_dr - LEFT JOIN com_dr_wrkplace_his ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace_his.dcf_pcf_dr_cd - LEFT JOIN com_inst ON com_dr_wrkplace_his.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd - LEFT JOIN com_blng_sec ON com_dr_wrkplace_his.blng_sec_cd = com_blng_sec.blng_sec_cd - LEFT JOIN com_post as univ_post ON com_dr_wrkplace_his.identity_cd = univ_post.post_cd - LEFT JOIN com_post as post ON com_dr_wrkplace_his.post_cd = post.post_cd + FROM src05.com_dr + LEFT JOIN src05.com_dr_wrkplace_his ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace_his.dcf_pcf_dr_cd + LEFT JOIN src05.com_inst ON com_dr_wrkplace_his.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd + LEFT JOIN src05.com_blng_sec ON com_dr_wrkplace_his.blng_sec_cd = com_blng_sec.blng_sec_cd + LEFT JOIN src05.com_post as univ_post ON com_dr_wrkplace_his.identity_cd = univ_post.post_cd + LEFT JOIN src05.com_post as post ON com_dr_wrkplace_his.post_cd = post.post_cd WHERE com_dr.dcf_pcf_dr_cd = :id ORDER BY com_dr_wrkplace_his.aply_end_ymd DESC, com_dr_wrkplace_his.aply_start_ymd DESC From c513fccd1950962f142f4b36bf1d34dfd167271c Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 4 Aug 2023 13:49:17 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20dump=E5=BE=A9=E5=85=83=E3=82=B9?= =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=97=E3=83=88=E3=81=AES3=20URI=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E5=87=A6=E7=90=86=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-restore-backup/src/restore_backup.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ecs/jskult-restore-backup/src/restore_backup.py b/ecs/jskult-restore-backup/src/restore_backup.py index 439fe4cf..b72d3625 100644 --- a/ecs/jskult-restore-backup/src/restore_backup.py +++ b/ecs/jskult-restore-backup/src/restore_backup.py @@ -1,7 +1,6 @@ """実消化＆アルトマークダンプ復元スクリプト""" import os -import re import subprocess import textwrap @@ -32,12 +31,6 @@ def exec(): # 復元対象のダンプファイルを特定 s3_file_path = environment.JSKULT_BACKUP_DUMP_S3_FILE_PATH - # S3 URIになっているか確認 - s3_file_path_pattern = r"s3://(.+)/dump/(\d{4})/(\d{2})/(\d{2})/backup_rds_src05_(\d+).gz" - if re.match(s3_file_path_pattern, s3_file_path) is None: - logger.warning('環境変数[JSKULT_BACKUP_DUMP_S3_FILE_PATH]に指定された、S3 URIの形式が不正です。') - return constants.BATCH_EXIT_CODE_SUCCESS - # aws s3 cpコマンドを実行してdumpファイルをローカルにダウンロードする s3_cp_process = subprocess.Popen(['aws', 's3', 'cp', s3_file_path, './dump.gz'], stderr=subprocess.PIPE) _, error = s3_cp_process.communicate() From f509aa57532ea7346d20d32695a5e8ac14a56243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 4 Aug 2023 13:52:42 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E3=83=90=E3=82=B0=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/.env.example | 2 +- .../table_mapper/concrete/com_alma_depart_disc_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_alma_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_blng_sec_mapper.py | 2 +- .../ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_hamtec_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_hp_assrt_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_inst_div_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_manage_mapper.py | 2 +- .../table_mapper/concrete/com_med_func_valuation_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_pharm_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_post_mapper.py | 2 +- .../table_mapper/concrete/com_regn_critic_pass_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_rehabili_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_sosiety_mapper.py | 2 +- .../table_mapper/concrete/com_specialist_license_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/com_trt_course_mapper.py | 2 +- .../utmp_tables/table_mapper/concrete/mst_prefc_mapper.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ecs/jskult-batch-daily/.env.example b/ecs/jskult-batch-daily/.env.example index 1e15cdb0..96ccefa5 100644 --- a/ecs/jskult-batch-daily/.env.example +++ b/ecs/jskult-batch-daily/.env.example @@ -15,10 +15,10 @@ JSKULT_CONFIG_CALENDAR_HOLIDAY_LIST_FILE_NAME=jskult_holiday_list.txt VJSK_DATA_SEND_FOLDER=send VJSK_DATA_BUCKET=************* JSKULT_CONFIG_CALENDAR_WHOLESALER_STOCK_FILE_NAME=jskult_wholesaler_stock_input_day_list.txt -VJSK_DATA_RECEIVE_FOLDER=********************** # 連携データ抽出期間 SALES_LAUNDERING_EXTRACT_DATE_PERIOD=0 # 洗替対象テーブル名 SALES_LAUNDERING_TARGET_TABLE_NAME=src05.sales_lau # 卸実績洗替で作成するデータの期間(年単位) SALES_LAUNDERING_TARGET_YEAR_OFFSET=5 +VJSK_DATA_RECEIVE_FOLDER=************* \ No newline at end of file diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_depart_disc_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_depart_disc_mapper.py index b5a57aad..f083b9d1 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_depart_disc_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_depart_disc_mapper.py @@ -69,7 +69,7 @@ class ComAlmaDepartDiscMapper(UltmarcTableMapper): src05.com_alma_depart_disc SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE alma_cd = :alma_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py index 27055955..9e8189bc 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py @@ -56,7 +56,7 @@ class ComAlmaMapper(UltmarcTableMapper): src05.com_alma SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE alma_cd = :alma_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_blng_sec_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_blng_sec_mapper.py index 3970919a..e6738d07 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_blng_sec_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_blng_sec_mapper.py @@ -69,7 +69,7 @@ class ComBlngSecMapper(UltmarcTableMapper): src05.com_blng_sec SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE blng_sec_cd = :blng_sec_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py index 394bb47b..7cb88f4c 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py @@ -141,7 +141,7 @@ class ComDrMapper(UltmarcTableMapper): src05.com_dr SET abolish_ymd = :maint_date, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE dcf_pcf_dr_cd = :dcf_pcf_dr_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hamtec_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hamtec_mapper.py index 4d43560a..e0ffbaae 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hamtec_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hamtec_mapper.py @@ -60,7 +60,7 @@ class ComHamtecMapper(UltmarcTableMapper): src05.com_hamtec SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE hamtec_cd = :hamtec_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hp_assrt_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hp_assrt_mapper.py index d18f824a..a5e3bbcd 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hp_assrt_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hp_assrt_mapper.py @@ -57,7 +57,7 @@ class ComHpAssrtMapper(UltmarcTableMapper): src05.com_hp_assrt SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE hp_assrt_cd = :hp_assrt_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_div_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_div_mapper.py index 08d9e03d..a8486689 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_div_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_div_mapper.py @@ -57,7 +57,7 @@ class ComInstDivMapper(UltmarcTableMapper): src05.com_inst_div SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE inst_div_cd = :inst_div_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_manage_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_manage_mapper.py index 1fca8b00..87e9b267 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_manage_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_manage_mapper.py @@ -57,7 +57,7 @@ class ComManageMapper(UltmarcTableMapper): src05.com_manage SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE manage_cd = :manage_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_med_func_valuation_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_med_func_valuation_mapper.py index f7c03fef..ee643c6a 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_med_func_valuation_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_med_func_valuation_mapper.py @@ -61,7 +61,7 @@ class ComMedFuncValuationMapper(UltmarcTableMapper): src05.com_med_func_valuation SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE med_func_valuation_cd = :med_func_valuation_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index 5b6a423d..b234815d 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -117,7 +117,7 @@ class ComPharmMapper(UltmarcTableMapper): src05.com_pharm SET abolish_ymd = :maintdate, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE dcf_dsf_inst_cd = :dcfdsf_inst_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_post_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_post_mapper.py index ed127c78..af13b51f 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_post_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_post_mapper.py @@ -56,7 +56,7 @@ class ComPostMapper(UltmarcTableMapper): src05.com_post SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE post_cd = :post_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_regn_critic_pass_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_regn_critic_pass_mapper.py index e3ac5f0d..925234fb 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_regn_critic_pass_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_regn_critic_pass_mapper.py @@ -59,7 +59,7 @@ class ComRegnCriticPassMapper(UltmarcTableMapper): src05.com_regn_critic_pass SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE regn_co_critic_pass_cd = :regn_co_critic_pass_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_rehabili_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_rehabili_mapper.py index 363f7684..e0e981b3 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_rehabili_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_rehabili_mapper.py @@ -58,7 +58,7 @@ class ComRehabiliMapper(UltmarcTableMapper): src05.com_rehabili SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE rehabili_cd = :rehabili_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sosiety_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sosiety_mapper.py index c98cfd1b..897dc15b 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sosiety_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sosiety_mapper.py @@ -57,7 +57,7 @@ class ComSosietyMapper(UltmarcTableMapper): src05.com_sosiety SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE sosiety_cd = :sosiety_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialist_license_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialist_license_mapper.py index 1c55e406..2d3f7934 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialist_license_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialist_license_mapper.py @@ -57,7 +57,7 @@ class ComSpecialistLicenseMapper(UltmarcTableMapper): src05.com_specialist_license SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE specialist_cd = :specialist_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_trt_course_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_trt_course_mapper.py index e8b4388f..b8d1dd52 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_trt_course_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_trt_course_mapper.py @@ -63,7 +63,7 @@ class ComTrtCourseMapper(UltmarcTableMapper): src05.com_trt_course SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE trt_course_cd = :trt_course_cd diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/mst_prefc_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/mst_prefc_mapper.py index 64e14591..299d0556 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/mst_prefc_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/mst_prefc_mapper.py @@ -60,7 +60,7 @@ class MstPrefcMapper(UltmarcTableMapper): src05.mst_prefc SET delete_flg = '1', - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE prefc_cd = :prefc_cd From d8c64401b02fd8cef1042bedd351cce6815e9295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 4 Aug 2023 13:54:31 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/.env.example b/ecs/jskult-batch-daily/.env.example index 96ccefa5..050356cf 100644 --- a/ecs/jskult-batch-daily/.env.example +++ b/ecs/jskult-batch-daily/.env.example @@ -13,6 +13,7 @@ JSKULT_CONFIG_BUCKET=********************** JSKULT_CONFIG_CALENDAR_FOLDER=jskult/calendar JSKULT_CONFIG_CALENDAR_HOLIDAY_LIST_FILE_NAME=jskult_holiday_list.txt VJSK_DATA_SEND_FOLDER=send +VJSK_DATA_RECEIVE_FOLDER=recv VJSK_DATA_BUCKET=************* JSKULT_CONFIG_CALENDAR_WHOLESALER_STOCK_FILE_NAME=jskult_wholesaler_stock_input_day_list.txt # 連携データ抽出期間 @@ -21,4 +22,3 @@ SALES_LAUNDERING_EXTRACT_DATE_PERIOD=0 SALES_LAUNDERING_TARGET_TABLE_NAME=src05.sales_lau # 卸実績洗替で作成するデータの期間(年単位) SALES_LAUNDERING_TARGET_YEAR_OFFSET=5 -VJSK_DATA_RECEIVE_FOLDER=************* \ No newline at end of file From 97feb5f656c7994203dd32ada0be03c2349893ab Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 8 Aug 2023 17:15:06 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E7=94=9F=E7=89=A9=E7=94=B1=E6=9D=A5?= =?UTF-8?q?=E7=85=A7=E4=BC=9A=E7=94=BB=E9=9D=A2=E3=81=A735000=E4=BB=B6?= =?UTF-8?q?=E3=82=92=E8=B6=85=E3=81=88=E3=82=8B=E6=A4=9C=E7=B4=A2=E3=82=92?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=80=81=E4=BB=B6=E6=95=B0?= =?UTF-8?q?=E3=81=8C=E5=A4=9A=E3=81=99=E3=81=8E=E3=82=8B=E3=81=A8=E3=82=B5?= =?UTF-8?q?=E3=83=BC=E3=83=90=E3=83=BC=E3=81=8C=E3=83=A1=E3=83=A2=E3=83=AA?= =?UTF-8?q?=E4=B8=8D=E8=B6=B3=E3=82=92=E8=B5=B7=E3=81=93=E3=81=99=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/repositories/bio_sales_lot_repository.py | 7 +++++-- ecs/jskult-webapp/src/system_var/environment.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-webapp/src/repositories/bio_sales_lot_repository.py b/ecs/jskult-webapp/src/repositories/bio_sales_lot_repository.py index 10d187c2..03ee64a5 100644 --- a/ecs/jskult-webapp/src/repositories/bio_sales_lot_repository.py +++ b/ecs/jskult-webapp/src/repositories/bio_sales_lot_repository.py @@ -4,6 +4,7 @@ from src.logging.get_logger import get_logger from src.model.db.bio_sales_lot import BioSalesLotDBModel from src.model.request.bio import BioModel from src.repositories.base_repository import BaseRepository +from src.system_var import environment from src.util.string_util import is_not_empty logger = get_logger('生物由来参照') @@ -58,7 +59,8 @@ class BioSalesLotRepository(BaseRepository): rec_whs_sub_cd, rev_hsdnymd_srk, slip_mgt_num - ASC\ + ASC + LIMIT {limit}\ """ def fetch_many(self, parameter: BioModel) -> list[BioSalesLotDBModel]: @@ -66,7 +68,8 @@ class BioSalesLotRepository(BaseRepository): self._database.connect() logger.debug('DB参照実行') where_clause = self.__build_condition(parameter) - query = self.FETCH_SQL.format(where_clause=where_clause) + # システムとしての最大取得件数 +1 まで取る + query = self.FETCH_SQL.format(where_clause=where_clause, limit=environment.BIO_SEARCH_RESULT_MAX_COUNT + 1) logger.debug(f'SQL: {query}') result = self._database.execute_select(query, parameter.model_dump()) logger.debug(f'count= {len(result)}') diff --git a/ecs/jskult-webapp/src/system_var/environment.py b/ecs/jskult-webapp/src/system_var/environment.py index bbb40223..6e7cf79d 100644 --- a/ecs/jskult-webapp/src/system_var/environment.py +++ b/ecs/jskult-webapp/src/system_var/environment.py @@ -19,7 +19,7 @@ DB_USERNAME = os.environ['DB_USERNAME'] DB_PASSWORD = os.environ['DB_PASSWORD'] DB_SCHEMA = os.environ['DB_SCHEMA'] -BIO_SEARCH_RESULT_MAX_COUNT = int(os.environ['BIO_SEARCH_RESULT_MAX_COUNT']) +BIO_SEARCH_RESULT_MAX_COUNT = int(os.environ.get('BIO_SEARCH_RESULT_MAX_COUNT', 35000)) ULTMARC_SEARCH_RESULT_MAX_COUNT = int(os.environ['ULTMARC_SEARCH_RESULT_MAX_COUNT']) SESSION_EXPIRE_MINUTE = int(os.environ['SESSION_EXPIRE_MINUTE']) From 9cb11c49d07952ba4ea4fcbfa63857e88fd108df Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 9 Aug 2023 10:47:21 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20Excel/CSV=E5=87=BA=E5=8A=9B=E3=81=A7?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/repositories/bio_sales_lot_repository.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-webapp/src/repositories/bio_sales_lot_repository.py b/ecs/jskult-webapp/src/repositories/bio_sales_lot_repository.py index 03ee64a5..f3cbab0b 100644 --- a/ecs/jskult-webapp/src/repositories/bio_sales_lot_repository.py +++ b/ecs/jskult-webapp/src/repositories/bio_sales_lot_repository.py @@ -86,7 +86,7 @@ class BioSalesLotRepository(BaseRepository): self._database.connect() logger.debug('DB参照実行') where_clause = self.__build_condition(parameter) - query = self.FETCH_SQL.format(where_clause=where_clause) + query = self.FETCH_SQL.format(where_clause=where_clause, limit=environment.BIO_SEARCH_RESULT_MAX_COUNT + 1) logger.debug(f'SQL: {query}') df = self._to_data_frame(query, parameter) logger.debug(f'count= {len(df.index)}')