| | |
| | | List<String> resultUsers=new ArrayList<>(); |
| | | if(s.getControlUnit()!=null){ |
| | | String controlUnit = s.getControlUnit(); |
| | | List<String> users=sgProjectInfoMapper.getUserS(controlUnit); |
| | | List<String> controlUnitS = Arrays.asList(controlUnit.split(",")); |
| | | List<String> users=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | resultUsers.addAll(users); |
| | | } |
| | | // if(s.getSelfUnit()!=null){ |
| | |
| | | if("测量定位".equals(gxStepName)){ |
| | | |
| | | if(countyCd!=null){ |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd); |
| | | List<String> controlUnitS = Arrays.asList(countyCd.split(",")); |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | s.setXbUnitIDs(xbUnitIDs); |
| | | } |
| | | |
| | |
| | | List<String> resultUsers=new ArrayList<>(); |
| | | if(s.getControlUnit()!=null){ |
| | | String controlUnit = s.getControlUnit(); |
| | | List<String> users=sgProjectInfoMapper.getUserS(controlUnit); |
| | | List<String> controlUnitS = Arrays.asList(controlUnit.split(",")); |
| | | List<String> users=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | resultUsers.addAll(users); |
| | | } |
| | | // if(s.getSelfUnit()!=null){ |
| | |
| | | if("测量定位".equals(gxStepName)){ |
| | | |
| | | if(countyCd!=null){ |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd); |
| | | List<String> controlUnitS = Arrays.asList(countyCd.split(",")); |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | s.setXbUnitIDs(xbUnitIDs); |
| | | } |
| | | |
| | |
| | | |
| | | } |
| | | QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>(); |
| | | wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "施工准备"); |
| | | wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "测量定位"); |
| | | List<SgProgressReportDO> sgProgressReportDOS1 = sgProgressReportMapper.selectList(wrappers); |
| | | |
| | | if(sgProgressReportDO.getGxDeviceId()==998){ |
| | |
| | | |
| | | } |
| | | |
| | | // if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) { |
| | | // for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) { |
| | | // if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3) { |
| | | // throw new ServiceException("请先完成施工准备的审批!"); |
| | | // } |
| | | // } |
| | | // } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("施工准备"))) { |
| | | // throw new ServiceException("请先发起施工准备的审批!"); |
| | | // } |
| | | if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) { |
| | | for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) { |
| | | if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3) { |
| | | throw new ServiceException("请先完成测量定位的审批!"); |
| | | } |
| | | } |
| | | } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("测量定位"))) { |
| | | throw new ServiceException("请先发起测量定位的审批!"); |
| | | } |
| | | Long gxDeviceId = sgProgressReportDO.getGxDeviceId(); |
| | | Long gxStepId = sgProgressReportDO.getGxStepId(); |
| | | SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId); |
| | |
| | | QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>(); |
| | | wrapper.in("status",Arrays.asList(0,1,2,3)); |
| | | if(sgProgressReportDO.getGxDeviceId()==998 |
| | | //|| sgProgressReportDO.getGxDeviceId()==999 |
| | | || sgProgressReportDO.getGxDeviceId()==999 |
| | | ){ |
| | | wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4).eq("profram_id",sgProgressReportDO.getProframId()); |
| | | }else { |
| | |
| | | sgProgressReportMapper.insert(sgProgressReportDO); |
| | | String deviceType =""; |
| | | SgDeviceDO sgDeviceDO = new SgDeviceDO(); |
| | | // if (gxDeviceId == 999){ |
| | | // deviceType = "sgzb"; |
| | | // //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build()); |
| | | // }else |
| | | if (gxDeviceId == 999){ |
| | | deviceType = "cldw"; |
| | | //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build()); |
| | | }else |
| | | if(gxDeviceId == 998){ |
| | | deviceType = "sgys"; |
| | | //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build()); |
| | |
| | | } |
| | | |
| | | //加个项目及设备的状态判断 方便统计计算 |
| | | if(//gxStepId != 25 && |
| | | if(gxStepId != 20 && |
| | | gxStepId != 26 ) { |
| | | if (sgDeviceDO != null && sgDeviceDO.getStatus() == 0) { |
| | | sgDeviceDO.setStatus(1); |
| | |
| | | |
| | | if(sgProgressReportVO.getControlUnit()!=null){ |
| | | String controlUnit = sgProgressReportVO.getControlUnit(); |
| | | List<String> users1=sgProjectInfoMapper.getUserS(controlUnit); |
| | | List<String> controlUnitS = Arrays.asList(controlUnit.split(",")); |
| | | List<String> users1=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | sgProgressReportVO.setUserIDs(users1); |
| | | } |
| | | String gxStepName = sgProgressReportVO.getGxStepName(); |
| | |
| | | if("测量定位".equals(gxStepName)){ |
| | | |
| | | if(countyCd!=null){ |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd); |
| | | List<String> controlUnitS = Arrays.asList(countyCd.split(",")); |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | sgProgressReportVO.setXbUnitIDs(xbUnitIDs); |
| | | } |
| | | |
| | |
| | | List<String> resultUsers=new ArrayList<>(); |
| | | if(s.getControlUnit()!=null){ |
| | | String controlUnit = s.getControlUnit(); |
| | | List<String> users=sgProjectInfoMapper.getUserS(controlUnit); |
| | | List<String> controlUnitS = Arrays.asList(controlUnit.split(",")); |
| | | List<String> users=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | resultUsers.addAll(users); |
| | | } |
| | | // if(s.getSelfUnit()!=null){ |
| | |
| | | if("测量定位".equals(gxStepName)){ |
| | | |
| | | if(countyCd!=null){ |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd); |
| | | List<String> controlUnitS = Arrays.asList(countyCd.split(",")); |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | s.setXbUnitIDs(xbUnitIDs); |
| | | } |
| | | |
| | |
| | | List<String> resultUsers=new ArrayList<>(); |
| | | if(s.getControlUnit()!=null){ |
| | | String controlUnit = s.getControlUnit(); |
| | | List<String> users=sgProjectInfoMapper.getUserS(controlUnit); |
| | | List<String> controlUnitS = Arrays.asList(controlUnit.split(",")); |
| | | List<String> users=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | resultUsers.addAll(users); |
| | | } |
| | | // if(s.getSelfUnit()!=null){ |
| | |
| | | if("测量定位".equals(gxStepName)){ |
| | | |
| | | if(countyCd!=null){ |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd); |
| | | List<String> controlUnitS = Arrays.asList(countyCd.split(",")); |
| | | List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS); |
| | | s.setXbUnitIDs(xbUnitIDs); |
| | | } |
| | | |
| | |
| | | * 设置部门单位查询条件 |
| | | */ |
| | | private void setUnit(ProjectSearchDTO searchDTO, BladeUser user, Long roleId) { |
| | | List<Long> longList = Arrays.stream(user.getDeptId().split(",")) |
| | | .map(Long::parseLong) |
| | | List<String> longList = Arrays.stream(user.getDeptId().split(",")) |
| | | .collect(Collectors.toList()); |
| | | //判断是不是省厅建办 否的话就不设置部门 |
| | | if (!roleId.equals(1800820667082948610L)){ |
| | | //判断是不是县级建办 否的话就是监理单位下人员进行 |
| | | if(!roleId.equals(1811657352658042882L)){ |
| | | if(roleId.equals(1710904523971129345L)){ |
| | | searchDTO.setUserUnit(longList); |
| | | }else{ |
| | | } |
| | | |
| | | if(roleId.equals(1811657352658042882L)) { |
| | | searchDTO.setCountryUnit(longList); |
| | | } |
| | | |
| | | if(roleId==1800818489547112450L){ |
| | | searchDTO.setSelfUnit(longList); |
| | | } |
| | | } |
| | | } |
| | | |