diff --git a/ecs/jskult-webapp/src/controller/master_mainte.py b/ecs/jskult-webapp/src/controller/master_mainte.py index f4274604..93882d06 100644 --- a/ecs/jskult-webapp/src/controller/master_mainte.py +++ b/ecs/jskult-webapp/src/controller/master_mainte.py @@ -286,7 +286,7 @@ async def inst_emp_csv_download( ta_cd=csv_download_form.ta_cd, inst_cd=csv_download_form.inst_cd, emp_cd=csv_download_form.emp_cd, - apply_date=csv_download_form.apply_date, + apply_date_from=csv_download_form.apply_date_from, start_date_from=csv_download_form.start_date_from, start_date_to=csv_download_form.start_date_to, end_date_from=csv_download_form.end_date_from, diff --git a/ecs/jskult-webapp/src/model/request/master_mainte_csvdl.py b/ecs/jskult-webapp/src/model/request/master_mainte_csvdl.py index 293674e3..48b29db5 100644 --- a/ecs/jskult-webapp/src/model/request/master_mainte_csvdl.py +++ b/ecs/jskult-webapp/src/model/request/master_mainte_csvdl.py @@ -16,8 +16,8 @@ class MasterMainteCsvDlModel(RequestBaseModel): adapt_inst_cd: Optional[str] emp_cd: Optional[str] adapt_emp_cd: Optional[str] - apply_date: Optional[str] - adapt_apply_date: Optional[str] + apply_date_from: Optional[str] + adapt_apply_date_from: Optional[str] start_date_from: Optional[str] adapt_start_date_from: Optional[str] start_date_to: Optional[str] @@ -42,7 +42,7 @@ class MasterMainteCsvDlModel(RequestBaseModel): ctrl_ta_cd: Optional[str] = Form(None), ctrl_inst_cd: Optional[str] = Form(None), ctrl_emp_cd: Optional[str] = Form(None), - ctrl_apply_date: Optional[str] = Form(None), + ctrl_apply_date_from: Optional[str] = Form(None), ctrl_start_date_from: Optional[str] = Form(None), ctrl_start_date_to: Optional[str] = Form(None), ctrl_end_date_from: Optional[str] = Form(None), @@ -58,7 +58,7 @@ class MasterMainteCsvDlModel(RequestBaseModel): ctrl_ta_cd, ctrl_inst_cd, ctrl_emp_cd, - ctrl_apply_date, + ctrl_apply_date_from, ctrl_start_date_from, ctrl_start_date_to, ctrl_end_date_from, @@ -75,7 +75,7 @@ class MasterMainteCsvDlModel(RequestBaseModel): ctrl_ta_cd: str, ctrl_inst_cd: str, ctrl_emp_cd: str, - ctrl_apply_date: str, + ctrl_apply_date_from: str, ctrl_start_date_from: str, ctrl_start_date_to: str, ctrl_end_date_from: str, @@ -90,11 +90,11 @@ class MasterMainteCsvDlModel(RequestBaseModel): ctrl_inst_cd = ctrl_inst_cd if is_not_empty(ctrl_inst_cd) else '' ctrl_emp_cd = ctrl_emp_cd if is_not_empty(ctrl_emp_cd) else '' - adapt_apply_date = '' - if is_not_empty(ctrl_apply_date): - adapt_apply_date = ctrl_apply_date.replace('/', '') + adapt_apply_date_from = '' + if is_not_empty(ctrl_apply_date_from): + adapt_apply_date_from = ctrl_apply_date_from.replace('/', '') else: - ctrl_apply_date = '' + ctrl_apply_date_from = '' adapt_start_date_from = '' adapt_start_date_to = '' @@ -147,8 +147,8 @@ class MasterMainteCsvDlModel(RequestBaseModel): adapt_inst_cd=ctrl_inst_cd, emp_cd=ctrl_emp_cd, adapt_emp_cd=ctrl_emp_cd, - apply_date=ctrl_apply_date, - adapt_apply_date=adapt_apply_date, + apply_date_from=ctrl_apply_date_from, + adapt_apply_date_from=adapt_apply_date_from, start_date_from=ctrl_start_date_from, adapt_start_date_from=adapt_start_date_from, start_date_to=ctrl_start_date_to, diff --git a/ecs/jskult-webapp/src/model/view/inst_emp_csv_download_view_model.py b/ecs/jskult-webapp/src/model/view/inst_emp_csv_download_view_model.py index f35aa7cb..a0bd7f3d 100644 --- a/ecs/jskult-webapp/src/model/view/inst_emp_csv_download_view_model.py +++ b/ecs/jskult-webapp/src/model/view/inst_emp_csv_download_view_model.py @@ -9,7 +9,7 @@ class InstEmpCsvDownloadViewModel(BaseModel): ta_cd: Optional[str] = '' inst_cd: Optional[str] = '' emp_cd: Optional[str] = '' - apply_date: Optional[str] = '' + apply_date_from: Optional[str] = '' start_date_from: Optional[str] = '' start_date_to: Optional[str] = '' end_date_from: Optional[str] = '' 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 ec6e5df3..fbcfc962 100644 --- a/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py +++ b/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py @@ -219,59 +219,59 @@ class EmpChgInstRepository(BaseRepository): where_clauses.append(SQLCondition('eci.emp_cd', condition.LIKE, 'adapt_emp_cd')) # 適用期間内が入力されていた場合 - if is_not_empty(parameter.adapt_apply_date): - where_clauses.append(SQLCondition('eci.START_DATE', + if is_not_empty(parameter.adapt_apply_date_from): + where_clauses.append(SQLCondition('eci.start_date', condition.LE, - 'adapt_apply_date')) - where_clauses.append(SQLCondition('eci.END_DATE', + 'adapt_apply_date_from')) + where_clauses.append(SQLCondition('eci.end_date', condition.GE, - 'adapt_apply_date')) + 'adapt_apply_date_from')) # 適用開始日(FROM)が入力されていた場合 if is_not_empty(parameter.adapt_start_date_from): - where_clauses.append(SQLCondition('eci.START_DATE', + where_clauses.append(SQLCondition('eci.start_date', condition.GE, 'adapt_start_date_from')) # 適用開始日(TO)が入力されていた場合 if is_not_empty(parameter.adapt_start_date_to): - where_clauses.append(SQLCondition('eci.START_DATE', + where_clauses.append(SQLCondition('eci.start_date', condition.LE, 'adapt_start_date_to')) # 適用終了日(FROM)が入力されていた場合 if is_not_empty(parameter.adapt_end_date_from): - where_clauses.append(SQLCondition('eci.END_DATE', + where_clauses.append(SQLCondition('eci.end_date', condition.GE, 'adapt_end_date_from')) # 適用終了日(TO)が入力されていた場合 if is_not_empty(parameter.adapt_end_date_to): - where_clauses.append(SQLCondition('eci.END_DATE', + where_clauses.append(SQLCondition('eci.end_date', condition.LE, 'adapt_end_date_to')) # データ作成日(FROM)が入力されていた場合 if is_not_empty(parameter.adapt_create_date_from): - where_clauses.append(SQLCondition('eci.CREATE_DATE', + where_clauses.append(SQLCondition('eci.create_date', condition.GE, 'adapt_create_date_from')) # データ作成日(TO)が入力されていた場合 if is_not_empty(parameter.adapt_create_date_to): - where_clauses.append(SQLCondition('eci.CREATE_DATE', + where_clauses.append(SQLCondition('eci.create_date', condition.LE, 'adapt_create_date_to')) # データ作成日(FROM)が入力されていた場合 if is_not_empty(parameter.adapt_update_date_from): - where_clauses.append(SQLCondition('eci.UPDATE_DATE', + where_clauses.append(SQLCondition('eci.update_date', condition.GE, 'adapt_update_date_from')) # データ作成日(TO)が入力されていた場合 if is_not_empty(parameter.adapt_update_date_to): - where_clauses.append(SQLCondition('eci.UPDATE_DATE', + where_clauses.append(SQLCondition('eci.update_date', condition.LE, 'adapt_update_date_to')) diff --git a/ecs/jskult-webapp/src/repositories/emp_master_repository.py b/ecs/jskult-webapp/src/repositories/emp_master_repository.py index 6dfc08f5..8c278177 100644 --- a/ecs/jskult-webapp/src/repositories/emp_master_repository.py +++ b/ecs/jskult-webapp/src/repositories/emp_master_repository.py @@ -13,9 +13,9 @@ class EmpMasterRepository(BaseRepository): FROM src05.emp WHERE - emp.EMP_CD = :emp_cd + emp.emp_cd = :emp_cd AND str_to_date(emp.start_date, '%Y%m%d') <= str_to_date(:start_work_date, '%Y%m%d') - AND str_to_date(:start_work_date, '%Y%m%d') <= str_to_date(emp.END_DATE ,'%Y%m%d') + AND str_to_date(:start_work_date, '%Y%m%d') <= str_to_date(emp.end_date ,'%Y%m%d') """ def fetch_count(self, emp_cd, start_work_date) -> MasterMenteCountModel: diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html index 00ddd204..d8ac4d5b 100644 --- a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html +++ b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html @@ -85,7 +85,7 @@