lims-ruoyi-after.git

			@@ -105,7 +105,8 @@
			otherParam.setIsOrderAll(isOrderAll);
			otherParam.setCheckUserFlag(checkUserFlag);
			otherParam.setCheckUserId(SecurityUtils.getUserId());
			return insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), otherParam);
			IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), otherParam);
			return sampleOrderDtoIPage;
			}


			@@ -191,14 +192,14 @@
			auxiliaryOutputWorkingHours.setCheck(userId);//检测人
			auxiliaryOutputWorkingHours.setPrice(insProduct.getPrice());//单价
			auxiliaryOutputWorkingHours.setSampleId(insProduct.getInsSampleId());//样品id
			auxiliaryOutputWorkingHours.setInsProductId(insProduct.getId());//检验项id
			auxiliaryOutputWorkingHours.setInsProductId(Math.toIntExact(insProduct.getId()));//检验项id

			return auxiliaryOutputWorkingHours;
			}).collect(Collectors.toList());

			// 初次分配检验人，各个检验项默认订单的检验人
			List<Integer> insProductIds = insProductList.stream().map(insproduct -> {
			return insproduct.getId();
			return Math.toIntExact(insproduct.getId());
			}).collect(Collectors.toList());
			if(!CollectionUtils.isEmpty(insProductIds)){
			insProductMapper.batchUpdateInsProductCheckUserId(insProductIds, userId);
			@@ -308,7 +309,7 @@
			ip2.addAll(insProducts);
			}
			for (InsProduct product : ip2) {
			product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
			product.setStandardMethodListId(Long.valueOf(a.getInsulating().getStandardMethodListId()));
			}
			addInsProductMethod(a.getId(), ip2);
			}
			@@ -326,7 +327,7 @@
			ip2.addAll(insProducts);
			}
			for (InsProduct product : ip2) {
			product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId());
			product.setStandardMethodListId(Long.valueOf(a.getAuxiliaryWireCore().getStandardMethodListId()));
			}
			addInsProductMethod(a.getId(), ip2);
			}