From b50a43a7bdc3b3313bf3e4f03e4671156fae73a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Fri, 21 Jul 2023 17:06:37 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=98=E4=BD=93=E8=A9=A6=E9=A8=93?= =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/model/internal/master_mainte_csv.py | 24 +++++++++++-------- .../src/templates/instEmpCsvUL.html | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ecs/jskult-webapp/src/model/internal/master_mainte_csv.py b/ecs/jskult-webapp/src/model/internal/master_mainte_csv.py index 17585794..d8714f7a 100644 --- a/ecs/jskult-webapp/src/model/internal/master_mainte_csv.py +++ b/ecs/jskult-webapp/src/model/internal/master_mainte_csv.py @@ -5,6 +5,7 @@ from io import TextIOWrapper from datetime import datetime from abc import ABCMeta, abstractmethod from src.system_var import constants +from src.util.string_util import is_not_empty from src.repositories.mst_inst_repository import MstInstRepository from src.repositories.bu_master_cd_repository import BuMasterRepository from src.repositories.emp_master_repository import EmpMasterRepository @@ -121,11 +122,13 @@ class MasterMainteCSVItem(metaclass=ABCMeta): end_date_col_name: str) -> tuple[list[str], datetime, datetime]: error_list = [] - if start_date is not None: + start_date_time: datetime = None + end_date_time: datetime = None + if is_not_empty(start_date): (result, start_date_time) = self.__parse_str_to_date(start_date) if result is False: error_list.append(f'{self.line_num}行目の{start_date_col_name}が実在しない日付になっています。') - if end_date is not None: + if is_not_empty(end_date): (result, end_date_time) = self.__parse_str_to_date(end_date) if result is False: error_list.append(f'{self.line_num}行目の{end_date_col_name}が実在しない日付になっています。') @@ -252,7 +255,7 @@ class MasterMainteNewInstEmpCSVItem(MasterMainteCSVItem): def check_inst_cd_exists(self) -> list[str]: error_list = [] - if super().is_exist_inst_cd() is False: + if is_not_empty(self.inst_cd) and super().is_exist_inst_cd() is False: error_list.append( f'{self.line_num}行目の{constants.NEW_INST_EMP_CSV_LOGICAL_NAMES[constants.CSV_NEW_INST_CD_COL_NO]}\ は施設マスタに存在しないコードです。') @@ -260,7 +263,7 @@ class MasterMainteNewInstEmpCSVItem(MasterMainteCSVItem): def check_emp_cd_exists(self) -> list[str]: error_list = [] - if self.start_date is None or len(self.start_date) == 0: + if not self.start_date or not self.emp_cd: return error_list if super().is_exist_emp_cd(self.start_date) is True: @@ -271,7 +274,7 @@ class MasterMainteNewInstEmpCSVItem(MasterMainteCSVItem): def check_bu_cd_exists(self) -> list[str]: error_list = [] - if super().is_exist_bu_cd() is False: + if is_not_empty(self.bu_cd) and super().is_exist_bu_cd() is False: error_list.append(f'{self.line_num}行目の{constants.NEW_INST_EMP_CSV_LOGICAL_NAMES[constants.CSV_NEW_BU_CD_COL_NO]}\ はビジネスユニットマスタに存在しないコードです。') return error_list @@ -283,7 +286,7 @@ class MasterMainteNewInstEmpCSVItem(MasterMainteCSVItem): self.end_date, constants.NEW_INST_EMP_CSV_LOGICAL_NAMES[constants.CSV_NEW_START_DATE], constants.NEW_INST_EMP_CSV_LOGICAL_NAMES[constants.CSV_NEW_END_DATE]) - if len(error_list) > 0 or self.start_date is None or self.end_date is None: + if len(error_list) > 0 or not self.start_date or not self.end_date: return error_list if start_date_time > end_date_time: @@ -411,13 +414,15 @@ class MasterMainteChangeInstEmpCSVItem(MasterMainteCSVItem): def check_inst_cd_exists(self) -> list[str]: error_list = [] - if super().is_exist_inst_cd() is False: + if is_not_empty(self.inst_cd) and super().is_exist_inst_cd() is False: error_list.append(f'{self.line_num}行目の{constants.CHANGE_INST_CSV_LOGICAL_NAMES[constants.CSV_CHANGE_INST_CD_COL_NO]}\ は施設マスタに存在しないコードです。') return error_list def check_emp_cd_exists(self) -> list[str]: error_list = [] + if not self.start_date or not self.emp_cd: + return error_list if self.comment != '追加' and self.comment != '担当者修正': return error_list @@ -431,8 +436,7 @@ class MasterMainteChangeInstEmpCSVItem(MasterMainteCSVItem): """BuCd存在チェック""" error_list = [] - if super().is_exist_bu_cd() is False: - + if is_not_empty(self.bu_cd) and super().is_exist_bu_cd() is False: error_list.append(f'{self.line_num}行目の{constants.CHANGE_INST_CSV_LOGICAL_NAMES[constants.CSV_CHANGE_BU_CD_COL_NO]}\ はビジネスユニットマスタに存在しないコードです。') return error_list @@ -460,7 +464,7 @@ class MasterMainteChangeInstEmpCSVItem(MasterMainteCSVItem): end_date, constants.CHANGE_INST_CSV_LOGICAL_NAMES[constants.CSV_CHANGE_INST_EMP_START_DATE_COL_NO], end_date_col_name) - if len(error_list) > 0 or start_date is None or end_date is None: + if len(error_list) > 0 or not start_date or not end_date: return error_list if start_date_time > end_date_time: diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html index 178bdd18..45744fcf 100644 --- a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html +++ b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html @@ -29,7 +29,7 @@

- +

施設担当者データCSVアップロ－ド

施設担当者データCSVアップロード

 {% if mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty() %}