tx-lims-after.git

			@@ -73,10 +73,23 @@
			//获取检验下单数据
			@Override
			public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
			Map<String, Object> map = new HashMap<>();
			map.put("head", PrintChina.printChina(SampleOrderDto.class));
			//判断全部,个人,组织的权限
			Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
			User user = userMapper.selectById(map1.get("userId"));
			User user = userMapper.selectById(map1.get("userId"));//当前登录的人
			Integer roleId = user.getRoleId();
			//获取当前人所属实验室id
			String departLimsId = user.getDepartLimsId();
			String laboratory=null;
			if (ObjectUtils.isNotEmpty(departLimsId) && !departLimsId.equals("")){
			String[] split = departLimsId.split(",");
			//查询对应架构名称(通信实验室,电力实验室,检测办)
			String departLims=baseMapper.seldepLimsId(Integer.parseInt(split[split.length - 1]));
			if (departLims.contains("实验室")){
			laboratory=departLims;
			}
			}
			//判断是否是全部权限
			Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "selectAllInsOrder"));
			if (ObjectUtils.isEmpty(power)) {
			@@ -92,9 +105,7 @@
			}
			}
			}
			Map<String, Object> map = new HashMap<>();
			map.put("head", PrintChina.printChina(SampleOrderDto.class));
			map.put("body", insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto)));
			map.put("body", insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto),laboratory));
			return map;
			}

			@@ -318,7 +329,67 @@
			}
			}
			insProductService.saveBatch(insProductes);
			} else {
			}
			//判断热循环项目的添加和温升试验项目的添加
			else if (product.getInspectionItem().equals("热循环") \|\| product.getInspectionItem().equals("温升试验")) {
			List<InsProduct> insProductess = new ArrayList<>();
			insProductess.add(product);
			List<InsProduct> insProductes = new ArrayList<>();
			List<InsProduct> insProducts = new ArrayList<>();
			String[] strings = product.getAsk().split(";");
			//循环次数
			int count = Integer.parseInt(strings[strings.length - 1]);
			for (int i = 0; i < strings.length - 1; i++) {
			String[] split = strings[i].split(",");
			InsProduct insProduct = new InsProduct();
			insProduct.setInspectionItem("1");//检验父项--循环次数
			insProduct.setInspectionItemSubclass(split[0]);//检验子项--环境温度/导线温度/耐张温度/接续温度
			insProduct.setInspectionItemSubclassEn(split[1]);//检验子项英文--环境温度/导线温度/耐张温度/接续温度
			insProduct.setAsk(null);//检验要求
			insProduct.setTell(null);//检验描述
			insProduct.setInsSampleId(sampleId);
			insProduct.setState(1);
			insProduct.setFactory(product.getFactory());
			insProduct.setLaboratory(product.getLaboratory());
			insProduct.setSampleType(product.getSampleType());
			insProduct.setSample(product.getSample());
			insProduct.setModel(product.getModel());
			insProduct.setSonLaboratory(product.getSonLaboratory());
			insProduct.setUnit("℃");//单位
			insProduct.setManHourGroup(product.getManHourGroup());
			insProduct.setInspectionItemType("0");
			insProduct.setInspectionValueType("1");
			insProducts.add(insProduct);
			insProductes.add(insProduct);
			insProductess.add(insProduct);
			}
			//热循环才有多次循环次数
			if (product.getInspectionItem().equals("热循环")) {
			//热循环还要加上直流电阻
			for (InsProduct insProduct : insProducts) {
			InsProduct insProduct1 = new InsProduct();
			BeanUtils.copyProperties(insProduct, insProduct1);
			insProduct1.setInspectionItemClass("直流电阻");//检验子子项--直流电阻
			insProduct1.setInspectionItemClassEn("DC resistance");//检验子子项英文--直流电阻
			insProduct1.setUnit("Ω/km");//单位
			insProductes.add(insProduct1);
			insProductess.add(insProduct1);
			}
			}
			if (count > 1) {
			//循环超过1次
			for (int j = 2; j <= count; j++) {
			for (InsProduct insProduct : insProductes) {
			InsProduct insProduct1 = new InsProduct();
			BeanUtils.copyProperties(insProduct, insProduct1);
			insProduct1.setInspectionItem(j + "");//循环次数
			insProductess.add(insProduct1);
			}
			}
			}
			insProductService.saveBatch(insProductess);
			}
			else {
			if (!is) {
			switch (type) {
			case 1:
			@@ -404,6 +475,21 @@
			}

			@Override
			public Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto) {
			Map<String, Object> map = new HashMap<>();
			String dates = costStatisticsDto.getDates();
			String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
			costStatisticsDto.setDates(null);
			List<CostStatisticsDto> costStatisticsDtos = insOrderMapper.selectCostStatistics2(QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59"));
			double totalPrice = costStatisticsDtos.stream()
			.filter(dto -> dto.getPrice() != null) // 过滤掉价格为 null 的对象
			.mapToDouble(value -> value.getPrice().doubleValue())
			.sum();
			map.put("total", totalPrice);
			return map;
			}

			@Override
			public Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber) {
			List<SampleDefectsFatherVo> sampleDefectsFatherVos = insOrderMapper.selectSampleDefects(page, inspectionItems, orderNumber);
			Map<String, Object> map = new HashMap<>();