From b8e67d5748a18e7e29d2ed1891f9c709a6d7cb3a Mon Sep 17 00:00:00 2001
From: gong <328255720@qq.com>
Date: Mon, 17 Jun 2024 17:28:48 +0800
Subject: [PATCH] 加个异步处理 测试出的问题
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 6 +++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java
index 03ed736..634eea0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java
@@ -28,5 +28,5 @@
* @param deviceId
* @return
*/
- List<SgDeviceGxStepDO> getDeviceGXList(@Param("gxInfoId") Long deviceId);
+ List<SgDeviceGxStepDO> getDeviceGXList(@Param("deviceId") Long deviceId);
}
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
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index 6daf72e..f801c2f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -71,7 +71,7 @@
Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
Long gxStepId = sgProgressReportDO.getGxStepId();
List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId);
- SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxDeviceId);
+ SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
for (SgGxStepDO gxStepDO : list) {
if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) == 1) {
LambdaQueryChainWrapper<SgProgressReportDO> wrapper = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getGxStepId, gxStepDO.getId());
@@ -110,7 +110,7 @@
}
SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(sgProgressReportDO.getProframId());
if (sgProjectInfoDO != null && sgProjectInfoDO.getStatus() == 0) {
- sgDeviceDO.setStatus(1);
+ sgProjectInfoDO.setStatus(1);
sgProjectInfoMapper.updateById(sgProjectInfoDO);
}
}
@@ -214,7 +214,7 @@
}
int size = sgDeviceGxStepDOs.size();
- if((size*2)/countStatus==1){
+ if(countStatus!=0&&(size*2)/countStatus==1){
//如果设备下全部工序审核完成
sgDeviceDO.setStatus(2);
sgDeviceMapper.updateById(sgDeviceDO);
--
Gitblit v1.9.3