湖北水库：施工：修复工序创建人展示ID问题、修复项目整体流程状态问题

shenyijian

2024-06-19 2d0c7df13ca1a75226b49a10f9552873575836e7

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java

@@ -69,6 +69,7 @@
   public void add(SgProgressReportDO sgProgressReportDO) {
      Date now = DateUtil.now();
      sgProgressReportDO.setReportTime(now);
      sgProgressReportDO.setCreateTime(now);
      Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
      Long gxStepId = sgProgressReportDO.getGxStepId();
      List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId);
@@ -84,7 +85,7 @@
            QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
            wrapper1.eq("gx_step_id", gxStepDO.getId());
            SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
            if (one != null && one.getStatus() != 3) {
            if (one == null || one.getStatus() != 2) {
               throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
            }
         }
@@ -131,6 +132,8 @@
   @Override
   public SgProgressReportVO detail(String id) {
      SgProgressReportVO sgProgressReportVO = sgProgressReportMapper.queryById(id);
      SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(sgProgressReportVO.getGxDeviceId());
      sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getApprovalTime).list();
      List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
      List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
@@ -233,20 +236,20 @@
                  List<SgDeviceGxStepDO> sgDeviceGxStepDOs = sgGxStepMapper.getDeviceGXList(sgDeviceDO.getId());

                  if (sgDeviceGxStepDOs != null) {
                     int countStatus = 0;
                     for (SgDeviceGxStepDO sgDeviceGxStepDO : sgDeviceGxStepDOs) {
                        countStatus = +sgDeviceGxStepDO.getStatus();

                     }
                     int size = sgDeviceGxStepDOs.size();
                     if (countStatus != 0 && (size * 2) / countStatus == 1) {
//                     int countStatus = 0;
//                     for (SgDeviceGxStepDO sgDeviceGxStepDO : sgDeviceGxStepDOs) {
//                        countStatus = +sgDeviceGxStepDO.getStatus();
//
//                     }
//                     int size = sgDeviceGxStepDOs.size(); //4
                     boolean allStatusesAreTwo = sgDeviceGxStepDOs.stream()
                        .allMatch(s -> s.getStatus() == 2);
                        if (allStatusesAreTwo) {
                        //如果设备下全部工序审核完成
                        sgDeviceDO.setStatus(2);
                        sgDeviceMapper.updateById(sgDeviceDO);
                        deviceFinishCount++;
                     }


                        }
                  }
               }
               if (deviceFinishCount == sgDeviceDOS.size()) {
@@ -278,7 +281,9 @@
   public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
      Long userId = AuthUtil.getUserId();
      searchDTO.setUserId(userId);
      searchDTO.setApprovalStatus(0);
      Long pending = sgProgressReportMapper.countList(searchDTO);
      searchDTO.setApprovalStatus(1);
      Long over = sgProgressReportMapper.countList(searchDTO);
      Map<String, Long> map = new HashMap<>();
      map.put("pending",pending);
@@ -301,6 +306,29 @@
      map.put("reject", (long) reject.size());
      return map;
   }

   @Override
   public boolean checkStep(Long gxDeviceId, Long gxStepId) {
      List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId);
      SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
      QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
      wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId);
      List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
      if ( sgProgressReportDOS!=null && sgProgressReportDOS.size()>0){
         return false;
      }
      for (SgGxStepDO gxStepDO : list) {
         if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) == 1) {
            QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
            wrapper1.eq("gx_step_id", gxStepDO.getId());
            SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
            if (one == null || one.getStatus() != 2) {
               return false;
            }
         }
      }
      return true;
   }
}