diff --git a/ecs/jskult-batch-daily/.env b/ecs/jskult-batch-daily/.env new file mode 100644 index 00000000..214b488c --- /dev/null +++ b/ecs/jskult-batch-daily/.env @@ -0,0 +1,10 @@ +DB_HOST=localhost +DB_PORT=3306 +DB_USERNAME=root +DB_PASSWORD=admin +DB_SCHEMA=src05 +LOG_LEVEL=INFO +ULTMARC_DATA_BUCKET=**************** +ULTMARC_DATA_FOLDER=recv +ULTMARC_BACKUP_BUCKET=**************** +ULTMARC_BACKUP_FOLDER=ultmarc 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 e7add5f6..60aa4295 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 @@ -104,8 +104,6 @@ class ComPharmMapper(UltmarcTableMapper): UPDATE src05.com_pharm SET {update_columns} - sys_regist_date = :execute_datetime, - regist_prgm_id = :program_name, sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE @@ -148,8 +146,8 @@ class ComPharmMapper(UltmarcTableMapper): self.queries.append(self.INSERT_QUERY) return - # 追加、更新の場合 - update_columns = ','.join(self.__make_upsert_query(self)) + # 更新の場合 + update_columns = ','.join(self.__make_update_query(self)) if len(update_columns) > 0: # 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる update_columns += ',' @@ -161,7 +159,7 @@ class ComPharmMapper(UltmarcTableMapper): self.queries.append(update_query) return - def __make_upsert_query(self): + def __make_update_query(self): set_clauses = [] # 設定項目 # 設定項目の判定 @@ -199,9 +197,6 @@ class ComPharmMapper(UltmarcTableMapper): if self.record.close_flg == '@': self.query_parameter['close_flg'] = None self.query_parameter['close_yearmonth'] = None - else: - self.record.close_flg - self.record.close_yearmonth # 開業予定フラグ、開業予定年月 if len(self.record.open_flag + self.record.open_yearmonth) > 0: @@ -210,9 +205,6 @@ class ComPharmMapper(UltmarcTableMapper): if self.record.open_flag == '@': self.query_parameter['open_flag'] = None self.query_parameter['open_yearmonth'] = None - else: - self.record.open_flag - self.record.open_yearmonth # 施設代表者カナ if self.record.president_Kana != '': @@ -304,9 +296,5 @@ class ComPharmMapper(UltmarcTableMapper): self.query_parameter['close_flg'] = None self.query_parameter['close_yearmonth'] = None self.query_parameter['franchise_hq_yobi'] = None - else: - self.record.franchise_hq_id - self.record.franchise_hq_cd - self.record.franchise_hq_yobi return set_clauses