skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
@@ -53,7 +53,7 @@ sgDeviceDO.setCreateTime(now); } sgDeviceDO.setUpdateTime(now); return R.data(sgDeviceService.save(sgDeviceDO)); return R.data(sgDeviceService.saveById(sgDeviceDO)); } /** skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
@@ -96,8 +96,10 @@ public boolean saveById(SgDeviceDO sgDeviceDO) { QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>(); SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper.eq("profram_id", sgDeviceDO.getId()).eq("gx_step_id",26)); if (sgProgressReportDO.getStatus().equals(2)) { throw new ServiceException("施工验收完成不能增加设备"); if (sgProgressReportDO != null) { if(sgProgressReportDO.getStatus().equals(2)){ throw new ServiceException("施工验收完成不能增加设备"); } } return save(sgDeviceDO); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -87,7 +87,7 @@ return; } QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>(); wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "施工准R备"); wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "施工准备"); List<SgProgressReportDO> sgProgressReportDOS1 = sgProgressReportMapper.selectList(wrappers); if(sgProgressReportDO.getGxDeviceId()==998){ @@ -514,8 +514,10 @@ sgReportVO.setGxDeviceId(deviceId); sgReportVO.setGxStepId(sg.getId()); sgReportVO.setProframId(sgProgressReportMapper.selectProframId(deviceId)); }else { throw new ServiceException("第一工序未进行审批！"); } throw new ServiceException("第一工序未进行审批！"); } sgReportVO.setProframId(sgProgressReportMapper.selectProframId(deviceId)); sgReportVO.setGxStepId(sgGxStepMapper.queryStepList(deviceId.toString()).get(0).getId());
