项目查询进度添加区域筛选和白蚁项目管理优化

yxm

2024-07-17 a1e7b27114eaf0bfd4d9768b76ba0db10e4d87bf

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

@@ -9,12 +9,14 @@
import cn.gistack.sm.sg.mapper.SgProgressReportMapper;
import cn.gistack.sm.sg.service.SgDeviceService;
import org.springblade.core.log.exception.ServiceException;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@@ -34,6 +36,7 @@
   @Autowired
   private SgProgressReportMapper sgProgressReportMapper;


   @Override
   public IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO) {
      List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(page,searchDTO);
@@ -48,10 +51,29 @@
    */
   @Override
   public List<SgDeviceDO> getDeviceList(String programId) {
      List<SgDeviceDO> list = new ArrayList<>();
      QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("program_id",programId).or()
         .in("device_type", Arrays.asList("sgys", "sgzb")).orderByAsc("create_time");
        return baseMapper.selectList(queryWrapper);
      queryWrapper.eq("program_id", programId);
      SgDeviceDO sg1 = new SgDeviceDO();
      sg1.setId((long) 999);
      sg1.setDeviceName("施工准备");
      sg1.setDeviceType("sgzb");
      sg1.setStatus(0);
      list.add(sg1);

      List<SgDeviceDO> sgDeviceDOS = baseMapper.selectList(queryWrapper);
      if (CollectionUtils.isNotEmpty(sgDeviceDOS)) {
         list.addAll(sgDeviceDOS);
      }

      SgDeviceDO sg2 = new SgDeviceDO();
      sg2.setId((long) 998);
      sg2.setDeviceName("施工验收");
      sg2.setDeviceType("sgys");
      sg2.setStatus(0);
      list.add(sg2);

      return list;
   }

   @Override
@@ -61,14 +83,25 @@

   @Override
   public List<SgGxStepDO> queryStepList(String deviceId) {
      QueryWrapper<SgGxStepDO> queryWrapper = new QueryWrapper<>();
      if (deviceId.equals("36")) {
         queryWrapper.eq("gx_info_id", 9);
      } else if (deviceId.equals("37")) {
         queryWrapper.eq("gx_info_id", 10);
      } else {
         return sgGxStepMapper.queryStepList(deviceId);
      if(deviceId.equals("998")){
         return sgGxStepMapper.queryStepLists("sgys");
      }else if (deviceId.equals("999")){
         return sgGxStepMapper.queryStepLists("sgzb");
      }
      return sgGxStepMapper.selectList(queryWrapper);
      List<SgGxStepDO> sgGxStepDOS = sgGxStepMapper.queryStepList(deviceId);
      return sgGxStepDOS;
   }

   @Override
   public boolean saveById(SgDeviceDO sgDeviceDO) {
      QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>();
      SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper.eq("profram_id", sgDeviceDO.getProgramId()).eq("gx_step_id",26));
      if (sgProgressReportDO != null) {
         if(sgProgressReportDO.getStatus().equals(2)){
            throw new ServiceException("施工验收完成不能增加设备");
         }
      }

      return save(sgDeviceDO);
   }
}