prepare AI

de/tj/JD_DingEShu.csv

@@ -107,7 +107,7 @@
 105,106,106,00000106,6.1.4  构筑物,,,,4
 106,107,107,00000107,6.1.4.1  烟囱,,,,5
 107,108,108,00000108,6.1.4.2  水塔,,,,5
-108,109,109,00000109,6.1.4.3  贮水（油）地,,,,5
+108,109,109,00000109,6.1.4.3  贮水（油）池,,,,5
 109,110,110,00000110,6.1.4.4  贮仓,,,,5
 110,111,111,00000111,6.1.4.5  钢筋混凝土支架及地沟,,,,5
 111,112,112,00000112,6.1.4.6  栈桥,,,,5
@@ -125,7 +125,7 @@
 123,124,124,00000124,6.2.3  泵送构筑物,,,,4
 124,125,125,00000125,6.2.3.1  烟囱,,,,5
 125,126,126,00000126,6.2.3.2  水塔,,,,5
-126,127,127,00000127,6.2.3.3  贮水（油）地,,,,5
+126,127,127,00000127,6.2.3.3  贮水（油）池,,,,5
 127,128,128,00000128,6.2.3.4  贮仓,,,,5
 128,129,129,00000129,6.2.3.5  钢筋混凝土支架,,,,5
 129,130,130,00000130,6.2.3.6  栈桥,,,,5
@@ -146,7 +146,7 @@
 144,145,145,00000145,6.3.3  非泵送构筑物,,,,4
 145,146,146,00000146,6.3.3.1  烟囱,,,,5
 146,147,147,00000147,6.3.3.2  水塔,,,,5
-147,148,148,00000148,6.3.3.3  贮水（油）地,,,,5
+147,148,148,00000148,6.3.3.3  贮水（油）池,,,,5
 148,149,149,00000149,6.3.3.4  贮仓,,,,5
 149,150,150,00000150,6.3.3.5  钢筋混凝土支架及地沟,,,,5
 150,151,151,00000151,6.3.3.6  栈桥,,,,5
@@ -252,7 +252,7 @@
 250,251,251,00000251,13.3  整体面层,,,,3
 251,252,252,00000252,13.3.1  水泥砂浆,,,,4
 252,253,253,00000253,13.3.2  水磨石,,,,4
-253,254,254,00000254,13.3.1  自流平地面及抗静电地面,,,,4
+253,254,254,00000254,13.3.3  自流平地面及抗静电地面,,,,4
 254,255,255,00000255,13.4  块料面层,,,,3
 255,256,256,00000256,13.4.1  石材块料面层,,,,4
 256,257,257,00000257,13.4.2  石材块料面板多色简单图案拼贴,,,,4
@@ -421,6 +421,7 @@
 419,420,420,00000420,20.1.2.4  单层轻钢厂房脚手架,,,,5
 420,421,421,00000421,20.1.2.5  高压线防护架、烟囱、水塔脚手架、金属过道防护棚,,,,5
 421,422,422,00000422,20.1.2.6  电梯井字架,,,,5
+469,470,423,00000470,20.1.2.7  构件吊装脚手架,,,,5
 422,423,424,00000423,20.2  建筑物檐高超20m脚手架材料增加费,,,,3
 423,424,425,00000424,20.2.1  综合脚手架,,,,4
 424,425,426,00000425,20.2.2  单项脚手架,,,,4
@@ -468,7 +469,6 @@
 466,467,468,00000467,24.1  机动翻斗车二次搬运,,,,3
 467,468,469,00000468,24.2  单(双)轮车二次搬运,,,,3
 468,469,470,00000469,大型机械进退场及安拆费,25-,,,2
-469,470,423,00000470,20.1.2.7  构件吊装脚手架,,,,5
 470,471,471,00000471,常州补充定额,,,,2
 471,472,472,00000472,常州补充定额2014,,,,3
 472,473,473,00000473,喷涂抹灰石膏,,,,4

main.py

@@ -955,7 +955,7 @@ async def applyFL(r: InfoWithID, user=Depends(manager)):
     data = json.loads(r.name)
     ##print(data)
  
-    return await db.applyFL(client, r.id, data)
+    return await db.applyFL(client, r.id, data, user)
 
 
 @app.post("/tiaojia/")

subdir/db.py

@@ -649,6 +649,8 @@ def roundstr(input):
 
 
 def roundstr4(input):
+    if len(input) == 0:
+        return input
     a = float(input)
     b = round(a, 4)
     return str(b)
@@ -1979,11 +1981,11 @@ async def savedjcs(client, data):
     await tbxx(client, biao_id)
     return {"result": "ok"}
 
-async def applyFL(client, id, data):
+async def applyFL(client, id, data, user):
     db = client["baojia"]
     collection = db["qufei"]
     
-    await collection.replace_one({"biao_id": id}, {"biao_id": id, "qufei": data})
+    await collection.replace_one({"biao_id": id}, {"biao_id": id, "qufei": data, "user" : user})
     collection = db['qdxm']
     xm = data[0]
     for dxgc in xm["children"]:
@@ -2542,7 +2544,7 @@ async def zujia(client, query, user):
             result[key]["count"] = result[key]["count"] + 1
         else:
             result[key] = {"count": 1, "name" : names, "unit" : post["单位"], "price" : post["综合单价"]}
-    return [{"id" : x, "组价定额" : x[0:x.rfind("@")], "数量" : result[x]["count"], "定额名称" : result[x]["name"], "单位" : result[x]['unit'], "综合单价" : result[x]['price']} for x in result.keys()]
+    return [{"id" : x, "组价定额" : x[0:x.rfind("@")], "数量" : result[x]["count"], "定额名称" : result[x]["name"], "单位" : result[x]['unit'], "综合单价" : roundstr(result[x]['price'])} for x in result.keys()]
 
 async def statistics(client, query, user):