From dbf7a98e66433fe77e723f9131d2ca29c97d6938 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 15 Jun 2023 15:29:32 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E?= =?UTF-8?q?=E3=83=83=E3=83=88=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/controller/ultmarc.py | 10 +++--- .../src/model/db/ultmarc_doctor_wrkplace.py | 2 +- .../model/db/ultmarc_doctor_wrkplace_his.py | 2 +- .../src/model/db/ultmarc_inst_info.py | 3 +- .../view/ultmarc_doctor_info_view_model.py | 13 ++++--- .../model/view/ultmarc_doctor_view_model.py | 3 +- .../view/ultmarc_inst_info_view_model.py | 4 --- .../src/model/view/ultmarc_inst_view_model.py | 4 +-- .../repositories/prefc_master_repository.py | 2 +- .../repositories/ultmarc_doctor_repository.py | 4 +-- .../ultmarc_dr_wrkplace_his_repository.py | 17 ++++----- .../ultmarc_dr_wrkplace_repository.py | 4 +-- .../repositories/ultmarc_inst_repository.py | 2 +- .../ultmarc_specialist_license_repository.py | 5 +-- .../src/services/ultmarc_view_service.py | 36 +++++++++---------- 15 files changed, 57 insertions(+), 54 deletions(-) diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py index 914826c9..65b3628c 100644 --- a/ecs/jskult-webapp/src/controller/ultmarc.py +++ b/ecs/jskult-webapp/src/controller/ultmarc.py @@ -1,15 +1,17 @@ from typing import Optional -from fastapi import APIRouter, Depends, Request +from fastapi import APIRouter, Depends, Request from src.depends.services import get_service from src.model.internal.session import UserSession -from src.model.request.ultmarc_doctor import UltmarcDoctorModel, UltmarcDoctorInfoModel -from src.model.request.ultmarc_inst import UltmarcInstModel, UltmarcInstInfoModel +from src.model.request.ultmarc_doctor import (UltmarcDoctorInfoModel, + UltmarcDoctorModel) +from src.model.request.ultmarc_inst import (UltmarcInstInfoModel, + UltmarcInstModel) from src.router.session_router import AuthenticatedRoute from src.services.batch_status_service import BatchStatusService -from src.services.ultmarc_view_service import UltmarcViewService from src.services.session_service import set_session +from src.services.ultmarc_view_service import UltmarcViewService from src.templates import templates router = APIRouter() diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py index c8f555cc..2737644e 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py @@ -1,5 +1,5 @@ -from typing import Optional from datetime import date +from typing import Optional from src.model.db.base_db_model import BaseDBModel from src.util.sanitize import sanitize diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py index 3fe3de38..b7077fd0 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py @@ -1,5 +1,5 @@ -from typing import Optional from datetime import date +from typing import Optional from src.model.db.base_db_model import BaseDBModel from src.util.sanitize import sanitize diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py index a72b38a9..5f829d97 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py @@ -1,5 +1,6 @@ -from typing import Optional from datetime import datetime +from typing import Optional + from src.model.db.base_db_model import BaseDBModel from src.util.sanitize import sanitize 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 0af599d4..6636d180 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 @@ -1,13 +1,16 @@ -from datetime import datetime, date +from datetime import datetime from typing import Optional + from pydantic import BaseModel from src.model.db.ultmarc_doctor_info import UltmarcDoctorInfoDBModel -from src.model.db.ultmarc_trt_course import UltmarcTrtCourseDBModel -from src.model.db.ultmarc_sosiety import UltmarcSosietyDBModel -from src.model.db.ultmarc_specialist_license import UltmarcSpecialistLicenseDBModel from src.model.db.ultmarc_doctor_wrkplace import UltmarcDoctorWrkplaceDBModel -from src.model.db.ultmarc_doctor_wrkplace_his import UltmarcDoctorWrkplaceHisDBModel +from src.model.db.ultmarc_doctor_wrkplace_his import \ + UltmarcDoctorWrkplaceHisDBModel +from src.model.db.ultmarc_sosiety import UltmarcSosietyDBModel +from src.model.db.ultmarc_specialist_license import \ + UltmarcSpecialistLicenseDBModel +from src.model.db.ultmarc_trt_course import UltmarcTrtCourseDBModel from src.system_var import environment diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py index 47f55454..62d83c65 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py @@ -1,13 +1,12 @@ import json -from collections import OrderedDict from datetime import datetime from typing import Optional from pydantic import BaseModel from src.model.db.prefc_master import PrefcMasterModel -from src.model.request.ultmarc_doctor import UltmarcDoctorModel from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel +from src.model.request.ultmarc_doctor import UltmarcDoctorModel from src.system_var import environment diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py index 6d64e04f..aea90678 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py @@ -1,13 +1,9 @@ -import json -from collections import OrderedDict -from datetime import datetime from typing import Optional from pydantic import BaseModel from src.model.db.ultmarc_inst_info import UltmarcInstInfoDBModel from src.model.db.ultmarc_inst_trt_course import UltmarcInstTrtCourseDBModel - from src.system_var import environment diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py index e728945a..9246d792 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py @@ -4,10 +4,10 @@ from typing import Optional from pydantic import BaseModel -from src.model.db.prefc_master import PrefcMasterModel from src.model.db.inst_div_master import InstDivMasterModel -from src.model.request.ultmarc_inst import UltmarcInstModel +from src.model.db.prefc_master import PrefcMasterModel from src.model.db.ultmarc_inst import UltmarcInstDBModel +from src.model.request.ultmarc_inst import UltmarcInstModel from src.system_var import environment diff --git a/ecs/jskult-webapp/src/repositories/prefc_master_repository.py b/ecs/jskult-webapp/src/repositories/prefc_master_repository.py index a8cf288f..c304f59f 100644 --- a/ecs/jskult-webapp/src/repositories/prefc_master_repository.py +++ b/ecs/jskult-webapp/src/repositories/prefc_master_repository.py @@ -5,7 +5,7 @@ from src.repositories.base_repository import BaseRepository class PrefcMasterRepository(BaseRepository): FETCH_SQL = """\ - SELECT DISTINCT + SELECT DISTINCT com_inst.prefc_cd AS prefc_cd, mst_prefc.prefc_name AS prefc_name FROM diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py index 153d8164..61552ecf 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py @@ -1,8 +1,8 @@ from src.db import sql_condition as condition from src.db.sql_condition import SQLCondition from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel -from src.model.request.ultmarc_doctor import UltmarcDoctorModel from src.model.db.ultmarc_doctor_info import UltmarcDoctorInfoDBModel +from src.model.request.ultmarc_doctor import UltmarcDoctorModel from src.repositories.base_repository import BaseRepository from src.util.string_util import is_not_empty @@ -84,7 +84,7 @@ class UltmarcDoctorRepository(BaseRepository): # 必ず部分一致で検索 parameter.dcf_dsf_inst_cd = f'%{parameter.dcf_dsf_inst_cd}%' where_clauses.append(SQLCondition( - 'com_inst.dcf_dsf_inst_cd', condition.LIKE, 'dcf_dsf_inst_cd')) + 'com_inst.dcf_dsf_inst_cd', condition.LIKE, 'dcf_dsf_inst_cd')) # 勤務先名(漢字) if is_not_empty(parameter.form_inst_name_kanji): # 必ず部分一致で検索 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 67ab328d..1fab4d45 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 @@ -1,17 +1,18 @@ -from src.model.db.ultmarc_doctor_wrkplace_his import UltmarcDoctorWrkplaceHisDBModel +from src.model.db.ultmarc_doctor_wrkplace_his import \ + UltmarcDoctorWrkplaceHisDBModel from src.repositories.base_repository import BaseRepository class UltmarcDoctorWrkplaceHisRepository(BaseRepository): FETCH_SQL = """\ - SELECT - com_inst.dcf_dsf_inst_cd, - com_inst.inst_name_kanji, - com_blng_sec.blng_sec_name, - univ_post.form_post_name as univ_post_name, - post.form_post_name as post_name, - com_dr_wrkplace_his.aply_start_ymd, + SELECT + com_inst.dcf_dsf_inst_cd, + com_inst.inst_name_kanji, + com_blng_sec.blng_sec_name, + univ_post.form_post_name as univ_post_name, + 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 diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py index cc6a9dc3..b05ce6fd 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py @@ -1,6 +1,6 @@ from src.model.db.ultmarc_doctor_wrkplace import UltmarcDoctorWrkplaceDBModel -from src.model.db.ultmarc_doctor_wrkplace_count import UltmarcDoctorWrkplaceCountDBModel - +from src.model.db.ultmarc_doctor_wrkplace_count import \ + UltmarcDoctorWrkplaceCountDBModel from src.repositories.base_repository import BaseRepository diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py index 0baaf56e..2ceebd0a 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py @@ -96,7 +96,7 @@ class UltmarcInstRepository(BaseRepository): where_clauses.append(SQLCondition('inst_addr', condition.LIKE, 'inst_addr')) # 削除表示フラグ - if is_not_empty(parameter.delFlg) == False: + if is_not_empty(parameter.delFlg) is False: # 論理和での検索 where_clauses.append(SQLCondition('', '', '(length(abolish_ymd) = 0 OR abolish_ymd IS NULL)', literal=True)) diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py index 35632081..a4927b44 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py @@ -1,11 +1,12 @@ -from src.model.db.ultmarc_specialist_license import UltmarcSpecialistLicenseDBModel +from src.model.db.ultmarc_specialist_license import \ + UltmarcSpecialistLicenseDBModel from src.repositories.base_repository import BaseRepository class UltmarcSpecialistLicenseRepository(BaseRepository): FETCH_SQL = """\ - SELECT + SELECT com_specialist_license.specialist_cd, com_specialist_license.specialist_license_name FROM src05.com_dr LEFT JOIN src05.com_sp_field ON com_dr.dcf_pcf_dr_cd = com_sp_field.dcf_pcf_dr_cd diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py index d8103c93..0855f288 100644 --- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py +++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py @@ -1,31 +1,31 @@ -import os.path as path -import shutil -from datetime import datetime - -import pandas as pd - from src.aws.aws_api_client import AWSAPIClient -from src.aws.s3 import S3Client from src.model.internal.session import UserSession from src.model.request.ultmarc_doctor import UltmarcDoctorModel from src.model.request.ultmarc_inst import UltmarcInstModel +from src.model.view.ultmarc_doctor_info_view_model import \ + UltmarcDoctorInfoViewModel from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel +from src.model.view.ultmarc_inst_info_view_model import \ + UltmarcInstInfoViewModel from src.model.view.ultmarc_inst_view_model import UltmarcInstViewModel -from src.model.view.ultmarc_inst_info_view_model import UltmarcInstInfoViewModel -from src.model.view.ultmarc_doctor_info_view_model import UltmarcDoctorInfoViewModel from src.repositories.base_repository import BaseRepository -from src.repositories.prefc_master_repository import PrefcMasterRepository from src.repositories.inst_master_repository import InstDivMasterRepository -from src.repositories.ultmarc_inst_repository import UltmarcInstRepository +from src.repositories.prefc_master_repository import PrefcMasterRepository from src.repositories.ultmarc_doctor_repository import UltmarcDoctorRepository -from src.repositories.ultmarc_trt_course_repository import UltmarcTrtCourseRepository -from src.repositories.ultmarc_inst_trt_course_repository import UltmarcInstTrtCourseRepository -from src.repositories.ultmarc_sosiety_repository import UltmarcSosietyRepository -from src.repositories.ultmarc_dr_wrkplace_repository import UltmarcDoctorWrkplaceRepository -from src.repositories.ultmarc_dr_wrkplace_his_repository import UltmarcDoctorWrkplaceHisRepository -from src.repositories.ultmarc_specialist_license_repository import UltmarcSpecialistLicenseRepository +from src.repositories.ultmarc_dr_wrkplace_his_repository import \ + UltmarcDoctorWrkplaceHisRepository +from src.repositories.ultmarc_dr_wrkplace_repository import \ + UltmarcDoctorWrkplaceRepository +from src.repositories.ultmarc_inst_repository import UltmarcInstRepository +from src.repositories.ultmarc_inst_trt_course_repository import \ + UltmarcInstTrtCourseRepository +from src.repositories.ultmarc_sosiety_repository import \ + UltmarcSosietyRepository +from src.repositories.ultmarc_specialist_license_repository import \ + UltmarcSpecialistLicenseRepository +from src.repositories.ultmarc_trt_course_repository import \ + UltmarcTrtCourseRepository from src.services.base_service import BaseService -from src.system_var import constants, environment class UltmarcViewService(BaseService):