From 491df5b1e0bb868f7c7c971445699e67b562a6b3 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 17 Jun 2024 18:58:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml
index bd3c9b2..6328056 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml
@@ -23,9 +23,9 @@
left join YWXT.SG_GX_STEP step on sg.id=step.gx_info_id
- where sd.id= = #{deviceId}
+ where sd.id= #{deviceId}
- ) info left join YWXT.SG_PROGRESS_REPORT sp on info.gxDeviceId=sp.PROFRAM_ID and info.gxId=sp.GX_STEP_ID
+ ) info left join YWXT.SG_PROGRESS_REPORT sp on info.gxDeviceId= sp.gx_device_id and info.gxId = sp.GX_STEP_ID
--
Gitblit v1.9.3