diff --git a/app/services/checkpoint.py b/app/services/checkpoint.py index 64ff8a6..0f5be9d 100644 --- a/app/services/checkpoint.py +++ b/app/services/checkpoint.py @@ -112,7 +112,7 @@ class CheckpointService(BaseService[Checkpoint]): } return { - 'success': failed_count == 0, + 'success': success_count > 0, 'message': '批量导入完成' if failed_count == 0 else f'部分导入失败', 'total_count': total_count, 'success_count': success_count, diff --git a/app/services/level_data.py b/app/services/level_data.py index f600c9f..7be92cd 100644 --- a/app/services/level_data.py +++ b/app/services/level_data.py @@ -33,7 +33,7 @@ class LevelDataService(BaseService[LevelData]): conditions["id"] = id return self.search_by_conditions(db, conditions) - + def get_by_nyid_and_linecode(self, db: Session, nyid: str, linecode: str = None) -> Optional[LevelData]: """根据期数ID和线路编码获取水准数据""" @@ -130,7 +130,7 @@ class LevelDataService(BaseService[LevelData]): } return { - 'success': failed_count == 0, + 'success': success_count > 0, 'message': '批量导入完成' if failed_count == 0 else f'部分导入失败', 'total_count': total_count, 'success_count': success_count, diff --git a/app/services/original_data.py b/app/services/original_data.py index b9e456c..9d64e99 100644 --- a/app/services/original_data.py +++ b/app/services/original_data.py @@ -179,6 +179,13 @@ class OriginalDataService(BaseService[OriginalData]): Returns: 原始数据列表 """ + print("搜索原始数据,参数:", { + "account_id": account_id, + "id": id, + "bfpcode": bfpcode, + "bffb": bffb, + "nyid": nyid, + "bfpl": bfpl}) try: # 构建查询条件 conditions = [] @@ -383,7 +390,7 @@ class OriginalDataService(BaseService[OriginalData]): } return { - 'success': failed_count == 0, + 'success': success_count > 0, 'message': '批量导入完成' if failed_count == 0 else f'部分导入失败', 'total_count': total_count, 'success_count': success_count, diff --git a/app/services/section_data.py b/app/services/section_data.py index 5c5642e..a2d6de0 100644 --- a/app/services/section_data.py +++ b/app/services/section_data.py @@ -300,7 +300,7 @@ class SectionDataService(BaseService[SectionData]): } return { - 'success': failed_count == 0, + 'success': success_count > 0, 'message': '批量导入完成' if failed_count == 0 else f'部分导入失败', 'total_count': total_count, 'success_count': success_count, diff --git a/app/services/settlement_data.py b/app/services/settlement_data.py index ddaef46..da93743 100644 --- a/app/services/settlement_data.py +++ b/app/services/settlement_data.py @@ -334,7 +334,7 @@ class SettlementDataService(BaseService[SettlementData]): } return { - 'success': failed_count == 0, + 'success': success_count > 0, 'message': '批量导入完成' if failed_count == 0 else f'部分导入失败', 'total_count': total_count, 'success_count': success_count,