Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into dev...

zhangk

2024-06-24 feb39b032f50cf5c3770a821652c132a15bcfef1

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

@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -69,10 +70,11 @@
   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);
      SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
      List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
      QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
      wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId);
      List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
@@ -80,9 +82,10 @@
         throw new ServiceException("此工序已存在审批！");
      }
      for (SgGxStepDO gxStepDO : list) {
         if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) == 1) {
         if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) >= 1) {
            QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
            wrapper1.eq("gx_step_id", gxStepDO.getId());
            wrapper1.eq("gx_device_id",gxDeviceId);
            SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
            if (one == null || one.getStatus() != 2) {
               throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
@@ -96,7 +99,7 @@
      SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
      String deviceType = sgDeviceDO.getDeviceType();
      List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
         .eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).list();
         .eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).orderByAsc(SgGxConfigDO::getSgOrder).list();
      List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
      if (CollectionUtils.isEmpty(roIds)){
         throw new ServiceException("请完成工序角色配置！");
@@ -110,6 +113,11 @@
      for (SgGxConfigDO sgGxConfigDO : sgGxConfigDOS) {
         sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));
         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgGxConfigDO.getUser()).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
         try {
            Thread.sleep(100);
         } catch (InterruptedException e) {
            throw new RuntimeException(e);
         }
         if (sgGxConfigDO.getSgOrder() == 1) {
            sgProgressReportDO.setAuditPerson(String.valueOf(sgGxConfigDO.getUser()));
            sgProgressReportMapper.updateById(sgProgressReportDO);
@@ -133,7 +141,7 @@
      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<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) {
@@ -175,7 +183,7 @@
            cachedThreadPool.execute(new Runnable(){
               @Override
               public  void  run(){
                  setProgramAndDeviceStatus();
                  setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
               }
            });

@@ -202,9 +210,23 @@
               reportUserDO.setIsHis(0);
               reportUserDO.setApprovalTime(date);
               sgReportUserMapper.insert(reportUserDO);
               try {
                  Thread.sleep(100);
               } catch (InterruptedException e) {
                  throw new RuntimeException(e);
               }
            }else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
               sgReportUserMapper.deleteById(reportUserDO.getId());
               reportUserDO.setId(null);
               reportUserDO.setApprovalStatus(0);
               reportUserDO.setIsHis(0);
               reportUserDO.setApprovalTime(date);
               sgReportUserMapper.updateById(reportUserDO);
               sgReportUserMapper.insert(reportUserDO);
               try {
                  Thread.sleep(100);
               } catch (InterruptedException e) {
                  throw new RuntimeException(e);
               }
            }
            if (reportUserDO.getApprovalOrder()==1){
               updateChainWrapper.set(SgProgressReportDO::getAuditPerson,reportUserDO.getUserId());
@@ -217,9 +239,10 @@
   }


   public void  setProgramAndDeviceStatus(){
   public void  setProgramAndDeviceStatus(Long projectId){
      //查询所有的项目
      List<SgProjectInfoDO> sgProjectInfoDOS = sgProjectInfoMapper.selectList(null);
      SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(projectId);
      List<SgProjectInfoDO> sgProjectInfoDOS = List.of(sgProjectInfoDO);
      if(sgProjectInfoDOS!=null&& !sgProjectInfoDOS.isEmpty()) {
         for (SgProjectInfoDO project : sgProjectInfoDOS) {
            QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
@@ -251,7 +274,7 @@
                        }
                  }
               }
               if (deviceFinishCount == sgDeviceDOS.size()) {
               if (deviceFinishCount!=0 && deviceFinishCount == sgDeviceDOS.size()) {
                  //如果项目下的设备下全部完成
                  project.setStatus(2);
                  sgProjectInfoMapper.updateById(project);
@@ -280,11 +303,13 @@
   public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
      Long userId = AuthUtil.getUserId();
      searchDTO.setUserId(userId);
      Long pending = sgProgressReportMapper.countList(searchDTO);
      Long over = sgProgressReportMapper.countList(searchDTO);
      searchDTO.setApprovalStatus(0);
      List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
      searchDTO.setApprovalStatus(1);
      List<SgProgressReportVO> over= sgProgressReportMapper.queryList(searchDTO);
      Map<String, Long> map = new HashMap<>();
      map.put("pending",pending);
      map.put("over",over);
      map.put("pending", Long.valueOf(pending.size()));
      map.put("over",Long.valueOf(over.size()));
      return map;
   }

@@ -303,6 +328,53 @@
      map.put("reject", (long) reject.size());
      return map;
   }

   @Override
   public boolean checkStep(Long gxDeviceId, Long gxStepId) {
      SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
      List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
      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());
            wrapper1.eq("gx_device_id", gxDeviceId);
            SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
            if (one == null || one.getStatus() != 2) {
               return false;
            }
         }
      }
      return true;
   }

   @Override
   public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
      Long userId = AuthUtil.getUserId();
      searchDTO.setUserId(userId);
      List<SgProgressReportVO> list = sgProgressReportMapper.queryList(page, searchDTO);
      return page.setRecords(list);
   }

   @Override
   public String getDeviceReport(Long gxDeviceId, Long gxStepId) {
      QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
      wrapper.eq("gx_device_id",gxDeviceId);
      if (gxStepId!=null){
         wrapper.eq("gx_step_id",gxStepId);
      }
      List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
      if (CollectionUtils.isNotEmpty(sgProgressReportDOS)){
         sgProgressReportDOS.sort((u1, u2) -> u2.getCreateTime().compareTo(u1.getCreateTime()));
      return sgProgressReportDOS.get(0).getId().toString();
      }
      return null;
   }
}