diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index 96d66ad7..294fe004 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -20,6 +20,7 @@ def exec(): db = Database.get_instance() try: db.connect() + db.to_jst() db.begin() logger.debug('DCF施設統合マスタ作成処理開始') # COM施設からDCF施設統合マスタに登録 diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/integrate_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/integrate_dcf_inst_merge.py index 816a0545..85de15ed 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/integrate_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/integrate_dcf_inst_merge.py @@ -14,6 +14,7 @@ def exec(): db = Database.get_instance() try: db.connect() + db.to_jst() db.begin() logger.debug('DCF施設統合マスタ日次更新処理開始') # DCF施設統合マスタ移行先コードのセット(無効フラグが『0(有効)』) diff --git a/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py index f78ece9b..8ec3b84e 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py @@ -13,6 +13,7 @@ def exec(): db = Database.get_instance() try: db.connect() + db.to_jst() logger.debug('##########################') logger.debug('START Changing Employee in charge of institution PGM.') # `emp_chg_inst_lau`をTruncate diff --git a/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py index 7f6d4259..58755f36 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py @@ -11,6 +11,7 @@ def exec(): db = Database.get_instance(autocommit=True) try: db.connect() + db.to_jst() logger.debug('処理開始') # 卸販売実績テーブル(洗替後)過去5年以前のデータ削除 _call_sales_lau_delete(db) diff --git a/ecs/jskult-batch-daily/src/db/database.py b/ecs/jskult-batch-daily/src/db/database.py index 280a9d8b..5ddaba4e 100644 --- a/ecs/jskult-batch-daily/src/db/database.py +++ b/ecs/jskult-batch-daily/src/db/database.py @@ -180,6 +180,9 @@ class Database: self.__connection.close() self.__connection = None + def to_jst(self): + self.execute('SET time_zone = "+9:00"') + def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する with self.__connection.begin(): diff --git a/ecs/jskult-webapp/src/db/database.py b/ecs/jskult-webapp/src/db/database.py index f700c016..971c859e 100644 --- a/ecs/jskult-webapp/src/db/database.py +++ b/ecs/jskult-webapp/src/db/database.py @@ -180,6 +180,9 @@ class Database: self.__connection.close() self.__connection = None + def to_jst(self): + self.execute('SET time_zone = "+9:00"') + def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する with self.__connection.begin(): diff --git a/ecs/jskult-webapp/src/model/internal/master_mainte_emp_chg_inst_function.py b/ecs/jskult-webapp/src/model/internal/master_mainte_emp_chg_inst_function.py index 4f4f6165..d4379a43 100644 --- a/ecs/jskult-webapp/src/model/internal/master_mainte_emp_chg_inst_function.py +++ b/ecs/jskult-webapp/src/model/internal/master_mainte_emp_chg_inst_function.py @@ -30,6 +30,7 @@ class MasterMainteEmpChgInstFunction(metaclass=ABCMeta): error_list = [] try: self.emp_chginst_repository.connect() + self.emp_chginst_repository.to_jst() self.emp_chginst_repository.begin() (result_message, error_list) = self.write_emp_chg_inst_table() if len(error_list) > 0: diff --git a/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py b/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py index 404d7bca..ce32a244 100644 --- a/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py +++ b/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py @@ -13,6 +13,9 @@ class EmpChgInstRepository(BaseRepository): def connect(self): self._database.connect() + + def to_jst(self): + self._database.to_jst() def begin(self): self._database.begin() @@ -110,7 +113,7 @@ class EmpChgInstRepository(BaseRepository): SET emp_cd = :emp_cd, updater = :update_user_name, - update_date = now() + update_date = NOW() where inst_cd = :inst_cd and ta_cd = :ta_cd diff --git a/ecs/jskult-webapp/src/services/master_mainte_service.py b/ecs/jskult-webapp/src/services/master_mainte_service.py index e9620eda..57ba896d 100644 --- a/ecs/jskult-webapp/src/services/master_mainte_service.py +++ b/ecs/jskult-webapp/src/services/master_mainte_service.py @@ -149,6 +149,7 @@ class MasterMainteService(BaseService): def copy_data_real_to_dummy(self) -> TableOverrideViewModel: try: self.emp_chginst_repository.connect() + self.emp_chginst_repository.to_jst() self.emp_chginst_repository.begin() self.emp_chginst_repository.delete_dummy_table() self.emp_chginst_repository.copy_real_to_dummy()