From ba093f1384660e37c89ce894b902f548dd4b4c40 Mon Sep 17 00:00:00 2001 From: liyxie Date: Thu, 16 Oct 2025 23:24:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=89=E9=99=8D=E6=95=B0=E6=8D=AE=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/settlement_data.py | 43 ++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/app/services/settlement_data.py b/app/services/settlement_data.py index 26416ee..6190e77 100644 --- a/app/services/settlement_data.py +++ b/app/services/settlement_data.py @@ -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(