From e7d581db5910814f46c5b612bb58a8089fed46bc Mon Sep 17 00:00:00 2001
From: Hermes CI Fix <hermes-ci@sxbh.ltd>
Date: Mon, 13 Jul 2026 14:59:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20Excel=E5=AF=BC=E5=85=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E2=80=94=E2=80=94=E6=94=AF=E6=8C=81=E5=A4=9A=E8=A1=8C?=
 =?UTF-8?q?+=E8=B7=B3=E8=BF=87=E6=98=8E=E7=BB=86+=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAverified?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/api/__pycache__/maps.cpython-312.pyc  | Bin 15763 -> 16410 bytes
 backend/app/api/data.py                       |  40 ++++++++++++------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/backend/app/api/__pycache__/maps.cpython-312.pyc b/backend/app/api/__pycache__/maps.cpython-312.pyc
index 9fec0546885a25e0f8fdfe3c946727d8310627da..f506c2c84018cbce5fbaeaa8199021edcad1d720 100644
GIT binary patch
delta 1149
zcmZ9KT}%^M6vum~(-upS3ZkU7bOfb#*`(zot`hMB5Um<bga^WIwmY`NR{-Tsan&{|
zNfVkFB61W^38G?RBpP5I{7N*w7?XW**_dc!Hmk9#Cc0tu#Wy`?iU~T&{oQlV`JaF8
zoqHjA?l@cgM^={AfZz0qhW74?Q;YN2jcJc8h)QmI6?D6Dp<XEPR4A5aF<cclO_CJ9
zCU<zFVh?XpB+PG)i%lz0?;}0i0#kx#N%aD4;a9J8%~P|WR;2r+{cF)@Rd{RM(6kym
zN_4k6baO3F*S9U`D?Xgz-L4H9x7rFqLV8a+MWhkO$Nvz+h8Tkf=0+IGDX|DKLA6CP
z!Eap(&vWwOxz#4dSbH{PyI0hPjbX8k)f>E~o*ZmUCC1;Lo%lB~^7_n`)aX>|{5`%C
z(|i{qY3Wo{Rc=vw7LoGiOj_*CfS9A8I%y6o9ZE#u>#*oG@&L81A(SCh+L|Ouyd3AG
zH7yNx$_Mx_RHYFF$ywumDw_KOy@7-r-!&h`cRsb{4MZPj7Cjb=wAt)&W(uMHxc2*!
zfM`}Q<jwFfuZo30To%hDuYU5|&0wW-pZ0#)4x?XJd2}hFCmZqR{@Cj~_g~%WPhB5L
zjb7!|nDYvJ-mk^69{nyly!KA&>LPR#I3yh#OouR>)|}3hB5Q?7cLO^zDDAcfN$?v%
zChUV>C5QP4g~#Bi6k?CGmr}Ff<d{+E>gIn3_mhP1NedMzwyahRlcpA~C|w-jiLZnW
z0rM9#fHnTY<r7rRXqDAqSdPfJ<qOn42C{#LooeYd`SVt|>kqJgFqLk~9Mx5N9rl#g
z=N_eSfN+X1h`@VvudAii_b0(z(x@sCUPslR2;+LLtt-fVv>XCknQJdlc$#pAaGuaX
z*hm;Aj1bNul8f5Z{muJ%rySumlsrecM7T(}OgIS9vckM?x2ZoUo`9LM+w3}Ylq+lk
zX3HB*v)J%i^Hubjm<MjIkJ|Mk+Q=r0AVYQK+KOHZ8wo!X==mkZjy5&I=~Z!hKAf(X
zHxTrznT2bWF6-a8W;oP$+MkvGu<{=bLPnpf*OiF=#hlN6D4i;v^!;zJuvG)<98Kev
U4>Wx=8iW;d0!DNBFtg#s7cXrr!vFvP

delta 767
zcmZ9KUue=%6vubfpDm|i$<l>pX}Vm*;^&_l=q&ap)<X|XNUSB+y*6c2xc(TF#Ug}W
zYPOxM*j7osEP7hM2=b-(0;9M1^|D@i=q>2Ey5}ds>cai-J?DGQ;r=+k)tdxr_766j
zrAM4^sdQ;WUbeeQVRJBVaL^=k&{4LpV4|tIDeHqRgNvMimcct5XKos0I|^ocvM#;E
zW^uCnnX@$3)!Rw+9_Tl^_UI$A(L~3@$N(L$_hb*klF>yb#NfcL$!+6;S9`;!RLwYH
zRfl%35h*8za`nA)%4E)?yaWU8B+0=!_jRcv5{v3*_bX$c?hSSenjYWZ+O}sz)c*8@
z9Yyp?h<QXAj(8K2BII+m>}{9`g<l8KWC5oAXB_9T;sRm@aS=BCd(8_dYw*c`nY7hd
zpkN?nSPu@6@9LW%v)ZVzHR%dxtjrs5NIpzfAT5VT18TD0)k3#-Heb!rypj(a_!>@I
zh1c?F2YTJufQo`WGDQ|46G`<w(yMeIo<*je*HGR;+(j%2z(<eo_&7%YzgpxpW0fg<
z65V5nbv;)s=lC#&E0BwN&o)rrLo6d6B4!bz2teFNGzGMs#cHKc;q!Tg<I?#9#1q70
z#8U)^PSoH3?=!iKP93D!Tk-<l#TaQpFrJY*BK<?X6~8T!5Lgm5hyICHEVdzLpqYrv
zH&A8-G}BzMs&M_M!0l^h%I28DIBt@s5l0an_?_@tz6eRgt+v%ra*L257)gEo1B{Bl
AjsO4v

diff --git a/backend/app/api/data.py b/backend/app/api/data.py
index a10988e3..74211df1 100644
--- a/backend/app/api/data.py
+++ b/backend/app/api/data.py
@@ -18,38 +18,52 @@ router = APIRouter(prefix="/api/cma/data", tags=["数据对接"],
 async def import_excel(file: UploadFile = File(...), db: Session = Depends(get_db)):
     content = await file.read()
     df = pd.read_excel(io.BytesIO(content))
-    
+
     required = ["kpi_code", "period", "actual_value"]
     if not all(c in df.columns for c in required):
         raise HTTPException(400, f"Excel必须包含列: {required}")
     
+    if len(df) == 0:
+        raise HTTPException(400, "Excel文件为空，没有数据行")
+    
+    from app.models import KPIDefinition
+    kpi_map = {k.kpi_code: k.id for k in db.query(KPIDefinition).all()}
+    
     batch = hashlib.md5(str(datetime.now().timestamp()).encode()).hexdigest()[:12]
     count = 0
-    for _, row in df.iterrows():
-        kpi_code = str(row.get("kpi_code", ""))
-        period = str(row.get("period", ""))
+    skipped = []
+    for idx, row in df.iterrows():
+        kpi_code = str(row.get("kpi_code", "")).strip()
+        period = str(row.get("period", "")).strip()
         value = row.get("actual_value")
+        
         if not kpi_code or not period or pd.isna(value):
+            skipped.append(f"第{idx+2}行: 缺少必填字段")
             continue
         
-        from app.models import KPIDefinition
-        kpi = db.query(KPIDefinition).filter(KPIDefinition.kpi_code == kpi_code).first()
-        if not kpi:
+        kid = kpi_map.get(kpi_code)
+        if not kid:
+            skipped.append(f"第{idx+2}行: KPI编码「{kpi_code}」不存在")
             continue
         
-        kv = KPIValue(
-            kpi_id=kpi.id,
+        db.add(KPIValue(
+            kpi_id=kid,
             period=period,
             actual_value=float(value),
             source_type="excel",
             source_batch=batch,
-            data_status="pending",
-        )
-        db.add(kv)
+            data_status="verified",
+        ))
         count += 1
     
     db.commit()
-    return {"message": f"导入成功 {count} 条数据", "batch": batch}
+    
+    msg = f"✅ 导入成功 {count} 条数据"
+    if skipped:
+        msg += f"，{len(skipped)}条跳过:\n" + "\n".join(skipped[:10])
+        if len(skipped) > 10:
+            msg += f"\n...还有{len(skipped)-10}条"
+    return {"message": msg, "batch": batch, "total": count, "skipped": len(skipped)}
 
 @router.get("/sources")
 def list_sources(db: Session = Depends(get_db)):