沉降数据插入逻辑修改

This commit is contained in:
2025-10-16 23:24:49 +08:00
parent 7ebfb49a18
commit ba093f1384

View File

@@ -240,29 +240,32 @@ class SettlementDataService(BaseService[SettlementData]):
settlement = self.get_by_point_and_nyid(
db,
# item_data.get('point_id'),
nyid=item_data.get('NYID')
nyid=item_data.get('NYID'),
point_id=item_data.get('point_id')
)
if settlement:
# 更新操作
settlement.CVALUE = item_data.get('CVALUE')
settlement.MAVALUE = item_data.get('MAVALUE')
settlement.MTIME_W = item_data.get('MTIME_W')
settlement.PRELOADH = item_data.get('PRELOADH')
settlement.PSTATE = item_data.get('PSTATE')
settlement.REMARK = item_data.get('REMARK')
settlement.WORKINFO = item_data.get('WORKINFO')
settlement.createdate = item_data.get('createdate')
settlement.day = item_data.get('day')
settlement.day_jg = item_data.get('day_jg')
settlement.isgzjdxz = item_data.get('isgzjdxz')
settlement.mavalue_bc = item_data.get('mavalue_bc')
settlement.mavalue_lj = item_data.get('mavalue_lj')
settlement.sjName = item_data.get('sjName')
settlement.useflag = item_data.get('useflag')
settlement.workinfoname = item_data.get('workinfoname')
settlement.upd_remark = item_data.get('upd_remark')
# 跳过数据
logger.info(f"Updated settlement data: {item_data.get('point_id')}-{item_data.get('NYID')}")
continue
# 更新操作
# settlement.CVALUE = item_data.get('CVALUE')
# settlement.MAVALUE = item_data.get('MAVALUE')
# settlement.MTIME_W = item_data.get('MTIME_W')
# settlement.PRELOADH = item_data.get('PRELOADH')
# settlement.PSTATE = item_data.get('PSTATE')
# settlement.REMARK = item_data.get('REMARK')
# settlement.WORKINFO = item_data.get('WORKINFO')
# settlement.createdate = item_data.get('createdate')
# settlement.day = item_data.get('day')
# settlement.day_jg = item_data.get('day_jg')
# settlement.isgzjdxz = item_data.get('isgzjdxz')
# settlement.mavalue_bc = item_data.get('mavalue_bc')
# settlement.mavalue_lj = item_data.get('mavalue_lj')
# settlement.sjName = item_data.get('sjName')
# settlement.useflag = item_data.get('useflag')
# settlement.workinfoname = item_data.get('workinfoname')
# settlement.upd_remark = item_data.get('upd_remark')
else:
# 新增操作
settlement = SettlementData(