diff --git a/vue-fastapi-backend/module_admin/controller/datastd_controller.py b/vue-fastapi-backend/module_admin/controller/datastd_controller.py index 30a3deb..7b2a82e 100644 --- a/vue-fastapi-backend/module_admin/controller/datastd_controller.py +++ b/vue-fastapi-backend/module_admin/controller/datastd_controller.py @@ -398,12 +398,12 @@ async def get_std_main_list( ) async def get_std_main_select_list( request: Request, - main_page_query: DataStdMainPageQueryModel = Depends(DataStdMainPageQueryModel.as_query), + main_page_query: DataStdMainModel= Depends(DataStdMainModel), query_db: AsyncSession = Depends(get_db), ): main_query_result = await DataStdService.get_std_main_list_all(query_db, main_page_query) logger.info('获取数据标准列表成功') - return ResponseUtil.success(model_content=main_query_result) + return ResponseUtil.success(data=main_query_result) @datastdController.get( '/stdmain/main/{id}', response_model=DataStdMainModel, dependencies=[Depends(CheckUserInterfaceAuth('datastd:stdmain:main:list'))] diff --git a/vue-fastapi-backend/module_admin/dao/datastd_dao.py b/vue-fastapi-backend/module_admin/dao/datastd_dao.py index f34d306..7a1ac5c 100644 --- a/vue-fastapi-backend/module_admin/dao/datastd_dao.py +++ b/vue-fastapi-backend/module_admin/dao/datastd_dao.py @@ -669,6 +669,8 @@ class DataStdDao: filters.append(DataStdMain.std_type == query_object.std_type) if query_object.std_status: filters.append(DataStdMain.std_status == query_object.std_status) + if query_object.content_onum: + filters.append(DataStdMain.content_onum == query_object.content_onum) query = select(DataStdMain).where(*filters).order_by(desc(DataStdMain.create_time)) return await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) @@ -686,10 +688,8 @@ class DataStdDao: filters.append(DataStdMain.std_type == query_object.std_type) if query_object.std_status: filters.append(DataStdMain.std_status == query_object.std_status) - query = select(DataStdMain).where(*filters).order_by(desc(DataStdMain.create_time)) - result = await db.execute(query) - return result.scalars().all() + return await PageUtil.paginate(db, query, 0, 0, False) @classmethod async def add_std_main(cls, db: AsyncSession, model: DataStdMainModel): col = DataStdMain(**model.model_dump()) diff --git a/vue-fastapi-backend/module_admin/service/datastd_service.py b/vue-fastapi-backend/module_admin/service/datastd_service.py index f7f2643..e2f69ff 100644 --- a/vue-fastapi-backend/module_admin/service/datastd_service.py +++ b/vue-fastapi-backend/module_admin/service/datastd_service.py @@ -75,7 +75,7 @@ class DataStdService: try: # 创建新的 page_object 实例，避免修改原始对象 new_page_object = DataStdCodeModel(**page_object.model_dump(by_alias=True)) - new_page_object.code_status="1" + new_page_object.code_status="9" # 调用 DAO 方法插入数据 await DataStdDao.add_std_code(query_db, new_page_object) return CrudResponseModel(is_success=True, message='新增标准代码成功') @@ -163,6 +163,7 @@ class DataStdService: else: # 保存标准代码 code.id=str(uuid.uuid4()) + await cls.add_std_code_services(request, query_db, code) # 为每个代码项设置parent_id，并进行校验 @@ -300,7 +301,7 @@ class DataStdService: raise ServiceException(message=f"数据字典{page_object.dict_num}已存在") # 创建新的 page_object 实例，避免修改原始对象 new_page_object = DataStdDictModel(**page_object.model_dump(by_alias=True)) - new_page_object.dict_status="1" + new_page_object.dict_status="9" new_page_object.id=str(uuid.uuid4()) # 调用 DAO 方法插入数据 await DataStdDao.add_std_dict(query_db, new_page_object) @@ -767,7 +768,8 @@ class DataStdService: return await DataStdDao.get_std_main_list(query_db, query_object, is_page) @classmethod async def get_std_main_list_all(cls, query_db: AsyncSession, query_object: DataStdMainModel): - return await DataStdDao.get_std_main_list_all(query_db, query_object) + main_query_result= await DataStdDao.get_std_main_list_all(query_db, query_object) + return main_query_result @classmethod async def get_std_main_by_id(cls, query_db: AsyncSession, id: str): @@ -782,6 +784,8 @@ class DataStdService: if not await cls.check_std_num_unique(query_db, model): raise ServiceException(message=f"标准编号 {model.std_num} 已存在") model.id=str(uuid.uuid4()) + model.std_status="9" + model.content_onum=2 await DataStdDao.add_std_main(query_db, model) return CrudResponseModel(is_success=True, message='新增标准成功') diff --git a/vue-fastapi-frontend/src/api/datastd/std.js b/vue-fastapi-frontend/src/api/datastd/std.js index 9dfb816..7c3a8d2 100644 --- a/vue-fastapi-frontend/src/api/datastd/std.js +++ b/vue-fastapi-frontend/src/api/datastd/std.js @@ -182,6 +182,14 @@ export function listStdMain(query) { params: query }) } +// 查询数据标准列表 +export function listStdMainSelect(query) { + return request({ + url: '/default-api/datastd/stdmain/main/selectlist', + method: 'get', + params: query + }) +} diff --git a/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue b/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue index cc97090..ef65dea 100644 --- a/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue +++ b/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue @@ -1,5 +1,5 @@