tx-lims-after.git

			@@ -136,9 +136,10 @@
			public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
			Map<String, Object> map = new HashMap<>();
			map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
			Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
			Integer userId = map1.get("userId");
			if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
			Integer userId = null;
			if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId()) ) {
			Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
			userId = map1.get("userId");
			insOrderPlanDTO.setUserId(userId.longValue());
			}
			IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
			@@ -217,7 +218,11 @@
			List<String> collect = new ArrayList<>();
			List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
			List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).eq(InsProduct::getInsResult, 0));
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			.in(InsProduct::getInsSampleId, ids)
			.eq(InsProduct::getSonLaboratory, laboratory)
			.eq(InsProduct::getState, 1)
			.eq(InsProduct::getInsResult, 0));
			if (insProducts.size() > 0) {
			collect = insProducts.stream().map(insProduct -> {
			return insProduct.getInspectionItem() + "-" + insProduct.getInspectionItemSubclass();
			@@ -361,6 +366,16 @@
			if (ObjectUtils.isNotEmpty(insProductResult)) {
			insProduct.setInsProductResult(insProductResult);
			}
			//求同等条件下1次循环20度常温的计算值
			InsProductResult insProductResult1 = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId,insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsSampleId,sampleId)
			.eq(InsProduct::getInspectionItem, "1")
			.eq(InsProduct::getInspectionItemSubclass, "20℃(常温)")
			.eq(InsProduct::getInspectionItemClass, insProduct.getInspectionItemClass())
			.eq(InsProduct::getInsFiberId, fiber.getId())).getId() ));
			if (!insProductResult1.getComValue().equals("[]")) {
			insProduct.setComplue(insProductResult1.getComValue().split(":")[1].split("\"")[1]);
			}
			productVo.setInsProduct(insProduct);
			productVos.add(productVo);
			}
			@@ -383,6 +398,16 @@
			productVo.setColor(fiber.getColor());
			productVo.setBushColor(fiber.getBushColor());
			insProduct.setInsProductResult(insProductResult);
			//求同等条件下1次循环20度常温的计算值
			InsProductResult insProductResult1 = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId,insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsSampleId,sampleId)
			.eq(InsProduct::getInspectionItem, "1")
			.eq(InsProduct::getInspectionItemSubclass, "20℃(常温)")
			.eq(InsProduct::getInspectionItemClass, insProduct.getInspectionItemClass())
			.eq(InsProduct::getInsFiberId, fiber.getId())).getId() ));
			if (!insProductResult1.getComValue().equals("[]")) {
			insProduct.setComplue(insProductResult1.getComValue().split(":")[1].split("\"")[1]);
			}
			productVo.setInsProduct(insProduct);
			productVos.add(productVo);
			}
			@@ -434,6 +459,8 @@
			JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
			Map<String, Object> map = new HashMap<>();
			map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
			map.put("r", JSON.toJSONString(insValue.get("r")));
			map.put("c", JSON.toJSONString(insValue.get("c")));
			try {
			if ((insValue.get("u") == null \|\| insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
			map.put("u", userId + "");
			@@ -3341,7 +3368,6 @@
			map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
			thing = map2.get(product.getTemplateId());
			}
			// thing = map2.get(product.getTemplateId());
			if (StrUtil.isNotEmpty(thing)) {
			JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
			JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
			@@ -3360,7 +3386,13 @@
			public int submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
			List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
			List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult).isNull(InsProduct::getInsFiberId).isNull(InsProduct::getInsFibersId));
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			.in(InsProduct::getInsSampleId, ids)
			.eq(InsProduct::getSonLaboratory, laboratory)
			.eq(InsProduct::getState, 1)
			.isNull(InsProduct::getInsResult)
			.isNull(InsProduct::getInsFiberId)
			.isNull(InsProduct::getInsFibersId));
			insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory));
			if (insProducts.size() > 0) {
			String str = "";