yxm
2024-07-17 a1e7b27114eaf0bfd4d9768b76ba0db10e4d87bf
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -83,8 +83,16 @@
      sgProgressReportDO.setCreateTime(now);
      //如果为草稿状态,单纯插入
      if(sgProgressReportDO.getStatus()==4){
         sgProgressReportMapper.insert(sgProgressReportDO);
         return;
         QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
         wrappers.eq("profram_id", sgProgressReportDO.getProframId()).eq("status", 4).eq("gx_step_id", sgProgressReportDO.getGxStepId())
            .eq("gx_device_id",sgProgressReportDO.getGxDeviceId());
         if(sgProgressReportMapper.selectOne(wrappers) == null){
            sgProgressReportMapper.insert(sgProgressReportDO);
            return;
         }else {
            throw  new ServiceException("已有草稿数据,无法保存");
         }
      }
      QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
      wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "施工准备");
@@ -203,7 +211,7 @@
         sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
      }else {
      sgProgressReportVO.setDeviceName("");}
      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getId).list();
      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getId).list();
      List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
      List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
      for (Map<String, Object> user : users) {