数据接口完善

This commit is contained in:
lhx
2025-09-28 17:30:40 +08:00
parent af25665997
commit 2e735e587b
6 changed files with 79 additions and 35 deletions

View File

@@ -2,6 +2,7 @@ from sqlalchemy.orm import Session
from typing import List, Optional, Dict, Any
from ..models.original_data import OriginalData
from .base import BaseService
from ..models.settlement_data import SettlementData
class OriginalDataService(BaseService[OriginalData]):
def __init__(self):
@@ -33,6 +34,11 @@ class OriginalDataService(BaseService[OriginalData]):
return self.search_by_conditions(db, conditions)
def _check_settlement_exists(self, db: Session, nyid: str) -> bool:
"""检查期数id沉降数据是否存在"""
settlement = db.query(SettlementData).filter(SettlementData.NYID == nyid).first()
return settlement is not None
def batch_import_original_data(self, db: Session, data: List) -> Dict[str, Any]:
"""
批量导入原始数据,直接新增,无需检查重复
@@ -55,6 +61,14 @@ class OriginalDataService(BaseService[OriginalData]):
for item_data in data:
try:
# 判断期数id是否存在
settlement = self._check_settlement_exists(db, item_data.get('NYID'))
if not settlement:
logger.error(f"Settlement {item_data.get('NYID')} not found")
raise Exception(f"Settlement {item_data.get('NYID')} not found")
# 直接新增操作
original_data = OriginalData(
bfpcode=item_data.get('bfpcode'),