yxm
2024-07-15 f4d561060588472c0e2bffbf78879e9b68af4330
项目进度上报逻辑优化及工序配置v0.5
1 files modified
12 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java 12 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -122,8 +122,16 @@
        }
        sgProgressReportDO.setStatus(0);
        sgProgressReportMapper.insert(sgProgressReportDO);
        SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
        String deviceType = sgDeviceDO.getDeviceType();
        String deviceType ="";
        SgDeviceDO sgDeviceDO = new SgDeviceDO();
        if (gxDeviceId.equals("999")){
             deviceType = "sgzb";
        }else if(gxDeviceId.equals("998")){
            deviceType = "sgys";
        }else {
             sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
            deviceType = sgDeviceDO.getDeviceType();
        }
        List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
            .eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).orderByAsc(SgGxConfigDO::getSgOrder).list();
        List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());