tx-lims-after.git

			@@ -154,13 +154,15 @@
			laboratory = departLims;
			}
			}
			String userName = null;
			Integer userId = null;
			if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
			userId = map1.get("userId");
			insOrderPlanDTO.setUserId(userId.longValue());
			userName = userMapper.selectById(map1.get("userId")).getName();
			insOrderPlanDTO.setUserId(null);
			}
			String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//试验室
			IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId, sonLaboratory, laboratory);
			IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userName, sonLaboratory, laboratory);
			map.put("body", insOrderPage);
			return map;
			}
			@@ -201,7 +203,7 @@
			}
			Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
			Integer userId = map1.get("userId");
			InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1, entity.getSonLaboratory());
			InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 0, entity.getSonLaboratory());
			return insSampleUserMapper.insert(insSampleUser) > 0;
			}

			@@ -230,50 +232,27 @@
			List<InsProduct> insProducts = new ArrayList<>();
			switch (type) {
			case 0:
			//样品
			insProducts = insSampleMapper.getInsProduct1(id, laboratory);
			break;
			case 1:
			//光纤带
			insProducts = insSampleMapper.getInsProduct2(id);
			break;
			case 2:
			//光纤
			insProducts = insSampleMapper.getInsProduct3(id);
			break;
			case 3:
			//套管
			insProducts = insSampleMapper.getInsProduct4(id);
			break;
			}
			// 数采新增
			getDeviceMessage(insProducts, request);

			Set<Integer> set = new HashSet<>();
			Map<Integer, String> map2 = new HashMap<>();
			if (BeanUtil.isEmpty(insProducts)) return null;
			getTemplateThing(set, map2, insProducts);
			return insProducts;
			}

			private List<InsProduct> getDeviceMessage(List<InsProduct> insProducts, HttpServletRequest request) {
			String ipAddress = request.getRemoteAddr();
			// 防止回环地址变为IPv6
			String ip = ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
			insProducts.forEach(i -> {
			Map<String, Object> devices = baseMapper.getDeviceMessage(ip, i.getInspectionItem(), i.getInspectionItemSubclass(), i.getSampleType());
			if (ObjectUtils.isNotEmpty(devices) && ObjectUtils.isNotEmpty(devices.get("file_type")) && ObjectUtils.isNotEmpty(devices.get("collect_url"))) {
			InsProductResult insProductResult = i.getInsProductResult();
			if (ObjectUtils.isEmpty(insProductResult)) {
			insProductResult = new InsProductResult();
			}
			List<Object> list = new ArrayList<>();
			Map<Object, Object> hashMap = new HashMap<>();
			hashMap.put("v", devices.get("device_name"));
			list.add(hashMap);
			insProductResult.setEquipName(JSON.toJSON(list).toString());
			List<Object> listValue = new ArrayList<>();
			Map<Object, Object> hashMapValue = new HashMap<>();
			hashMapValue.put("v", devices.get("management_number"));
			listValue.add(hashMapValue);
			insProductResult.setEquipName(JSON.toJSON(list).toString());
			insProductResult.setEquipValue(JSON.toJSON(listValue).toString());
			i.setInsProductResult(insProductResult);
			}
			});
			return insProducts;
			}

			@@ -348,13 +327,16 @@
			List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
			List<InsFibers> fibers = new ArrayList<>();
			List<InsFiber> fiber = new ArrayList<>();
			List<InsBushing> bush = new ArrayList<>();
			for (InsBushing insBushing : insBushings) {
			//再查询出所有的光纤带
			List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
			List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
			if (CollectionUtils.isNotEmpty(insFibers)) {
			for (InsFibers insFiber : insFibers) {
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFibersId, insFiber.getId()));
			List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult).filter(sm -> ObjectUtils.isNotEmpty(sm)).collect(Collectors.toList());
			List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult)
			.filter(sm -> ObjectUtils.isNotEmpty(sm) && sm!=2).collect(Collectors.toList());
			if (insProducts.size() == collect.size()) {
			insFiber.setState(1);//已检验
			} else {
			@@ -366,7 +348,8 @@
			List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().in(InsFiber::getInsFibersId, insFibers.stream().map(InsFibers::getId).collect(Collectors.toList())));
			for (InsFiber insFiber : fiberList) {
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFiberId, insFiber.getId()));
			List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult).filter(sm -> ObjectUtils.isNotEmpty(sm)).collect(Collectors.toList());
			List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult)
			.filter(sm -> ObjectUtils.isNotEmpty(sm) && sm!=2).collect(Collectors.toList());
			if (insProducts.size() == collect.size()) {
			insFiber.setState(1);//已检验
			} else {
			@@ -374,12 +357,13 @@
			}
			}
			fiber.addAll(fiberList);
			} else {
			//如果套管下没有光纤带就只有光纤了
			List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
			}
			//如果套管下没有光纤带就只有光纤了
			else if (CollectionUtils.isNotEmpty(insFiberList)) {
			for (InsFiber insFiber : insFiberList) {
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFiberId, insFiber.getId()));
			List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult).filter(sm -> ObjectUtils.isNotEmpty(sm)).collect(Collectors.toList());
			List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult)
			.filter(sm -> ObjectUtils.isNotEmpty(sm) && sm!=2).collect(Collectors.toList());
			if (insProducts.size() == collect.size()) {
			insFiber.setState(1);//已检验
			} else {
			@@ -388,9 +372,24 @@
			}
			fiber.addAll(insFiberList);
			}
			//如果光纤带和光纤都没有就只有套管(松套管)
			else {
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsBushId, insBushing.getId()));
			List<Integer> collect = insProducts.stream()
			.map(InsProduct::getInsResult)
			.filter(sm -> ObjectUtils.isNotEmpty(sm) && sm!=2).collect(Collectors.toList());
			if (insProducts.size() == collect.size()) {
			insBushing.setState(1);//已检验
			} else {
			insBushing.setState(0);//未检验
			}
			bush.add(insBushing);
			}
			}
			map.put("光纤带", fibers);
			map.put("光纤", fiber);
			map.put("套管", bush);
			return map;
			}

			@@ -515,7 +514,8 @@
			JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
			InsProduct insProduct = new InsProduct();
			insProduct.setId(Integer.parseInt(k));
			List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
			List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
			.eq(InsProductResult::getInsProductId, insProduct.getId()));
			InsProductResult result;
			if (CollectionUtils.isEmpty(results)) {
			result = new InsProductResult();
			@@ -523,7 +523,16 @@
			result = results.get(0);
			}
			result.setInsProductId(Integer.parseInt(k));
			/校验一下result表/
			List<InsProductResult> insProductResultss = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
			.eq(InsProductResult::getInsProductId, insProduct.getId()));
			if (insProductResultss.size() > 1) {
			for (int i = 1; i < insProductResultss.size(); i++) {
			insProductResultMapper.deleteById(insProductResultss.get(i));
			}
			}
			InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, Integer.parseInt(k)));
			//检验值
			if (jo.get("insValue") != null) {
			JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
			List<Map<String, Object>> iv = new ArrayList<>();
			@@ -546,6 +555,7 @@
			}
			result.setInsValue(JSON.toJSONString(iv));
			}
			//计算值
			if (jo.get("comValue") != null && !Objects.equals(jo.get("comValue"), "")) {
			JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
			List<Map<String, Object>> cv = new ArrayList<>();
			@@ -557,6 +567,7 @@
			}
			result.setComValue(JSON.toJSONString(cv));
			}
			//最终值
			try {
			JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
			if (resValue.get("v") != null) {
			@@ -566,6 +577,7 @@
			} catch (Exception e) {
			insProduct.setLastValue("");//''
			}
			//设备编号
			if (jo.get("equipValue") != null) {
			JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
			List<Map<String, Object>> ev = new ArrayList<>();
			@@ -577,6 +589,7 @@
			}
			result.setEquipValue(JSON.toJSONString(ev));
			}
			//设备名称
			if (jo.get("equipName") != null) {
			JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipName")));
			List<Map<String, Object>> ev = new ArrayList<>();
			@@ -588,6 +601,7 @@
			}
			result.setEquipName(JSON.toJSONString(ev));
			}
			//结论
			try {
			JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
			String ir = JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + "";
			@@ -604,6 +618,55 @@
			result.setUpdateTime(LocalDateTime.now());
			insProductResultMapper.updateById(result);
			}

			/如果是第一次选择设备信息,且还有其余样品也有同一个经验项目,那么所有样品的该项目都用这个设备信息/
			//先查询是否还有其余样品
			InsProduct product = insProductMapper.selectById(insProduct.getId());
			Integer insSampleId = product.getInsSampleId();
			List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSampleMapper.selectById(insSampleId).getInsOrderId()));
			if (insSamples.size() > 1 && !product.getInspectionItemType().equals("1")) {
			//存在其余样品,查询是否有同一种检验项目
			for (InsSample sample : insSamples.stream().filter(insSample -> !insSample.getId().equals(insSampleId)).collect(Collectors.toList())) {
			InsProduct product1 = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getState, 1)
			.eq(InsProduct::getInsSampleId, sample.getId())
			.eq(InsProduct::getInspectionItem, product.getInspectionItem())
			.eq(InsProduct::getInspectionItemEn, product.getInspectionItemEn())
			.eq(InsProduct::getInspectionItemSubclass, product.getInspectionItemSubclass())
			.eq(InsProduct::getInspectionItemSubclassEn, product.getInspectionItemSubclassEn())
			.eq(InsProduct::getTemplateId, product.getTemplateId())
			.eq(InsProduct::getStandardMethodListId, product.getStandardMethodListId())
			.eq(InsProduct::getInsBushId,product.getInsBushId())
			.eq(InsProduct::getInsFibersId,product.getInsFibersId())
			.eq(InsProduct::getInsFiberId,product.getInsFiberId())
			);
			if (ObjectUtils.isNotEmpty(product1)) {
			//如果存在项目,查询是否有表
			InsProductResult productResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery()
			.eq(InsProductResult::getInsProductId, product1.getId()));
			if (ObjectUtils.isEmpty(productResult)) {
			//没有表新建表
			productResult = new InsProductResult();
			productResult.setInsProductId(product1.getId());
			productResult.setEquipValue(result.getEquipValue());
			productResult.setEquipName(result.getEquipValue());
			productResult.setCreateUser(userId);
			productResult.setUpdateUser(userId);
			insProductResultMapper.insert(productResult);
			} else if (ObjectUtils.isEmpty(productResult.getEquipValue())) {
			//有表判断是否有设备
			productResult.setEquipValue(result.getEquipValue());
			productResult.setEquipName(result.getEquipValue());
			productResult.setUpdateUser(userId);
			productResult.setUpdateTime(LocalDateTime.now());
			insProductResultMapper.updateById(productResult);
			}
			}
			}

			}


			insProduct.setUpdateUser(userId);
			insProductMapper.updateById(insProduct);
			insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
			@@ -639,13 +702,15 @@
			.eq(AuxiliaryOutputWorkingHours::getCheck, userId)
			.eq(AuxiliaryOutputWorkingHours::getInspectionItem, insProduct.getInspectionItem())
			.eq(AuxiliaryOutputWorkingHours::getInspectionItemSubclass, insProduct.getInspectionItemSubclass())
			.eq(AuxiliaryOutputWorkingHours::getOvertimeOrderNo, insOrder.getEntrustCode()));
			.eq(AuxiliaryOutputWorkingHours::getOvertimeOrderNo, insOrder.getEntrustCode())
			.eq(AuxiliaryOutputWorkingHours::getSample, insSampleMapper.selectById(insProduct.getInsSampleId()).getSampleCode()));
			//非加班
			AuxiliaryOutputWorkingHours count2 = auxiliaryOutputWorkingHoursMapper.selectOne(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
			.eq(AuxiliaryOutputWorkingHours::getCheck, userId)
			.eq(AuxiliaryOutputWorkingHours::getInspectionItem, insProduct.getInspectionItem())
			.eq(AuxiliaryOutputWorkingHours::getInspectionItemSubclass, insProduct.getInspectionItemSubclass())
			.eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode()));
			.eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode())
			.eq(AuxiliaryOutputWorkingHours::getSample, insSampleMapper.selectById(insProduct.getInsSampleId()).getSampleCode()));
			if (ObjectUtils.isNotEmpty(insProduct.getManHour()) && ObjectUtils.isEmpty(count2) && ObjectUtils.isEmpty(count1)) {
			AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
			if (isWithinRange) {
			@@ -697,15 +762,23 @@
			Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsSampleId, insSample.getId()));
			Long l1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsSampleId, insSample.getId()).isNotNull(InsProduct::getInsResult));
			.eq(InsProduct::getInsSampleId, insSample.getId())
			.and(wrapper -> wrapper
			.isNull(InsProduct::getInsResult)
			.or()
			.eq(InsProduct::getInsResult, 2)
			));
			if (l == l1) {
			insSample.setInsState(2);
			}
			insSampleMapper.updateById(insSample);
			/校验一下result表/
			List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()).orderByDesc(InsProductResult::getId));
			List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
			.eq(InsProductResult::getInsProductId, insProduct.getId()));
			if (insProductResults.size() > 1) {
			insProductResultMapper.deleteById(insProductResults.get(0));
			for (int i = 1; i < insProductResults.size(); i++) {
			insProductResultMapper.deleteById(insProductResults.get(i));
			}
			}
			});
			return insContext.keySet().stream().findFirst().orElse(null);
			@@ -719,8 +792,17 @@
			int orderId = insSampleMapper.selectById(sampleId).getInsOrderId();
			// 通过订单id查找所有样本id
			List<Integer> sampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
			// 通过检查每一个样本id查到属于检验项结论 is null的数量
			Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()).eq(InsProduct::getState, 1));
			// 通过检查每一个样本id查到属于检验项结论 is null 或者 =2 的数量
			Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
			.in(InsProduct::getInsSampleId, sampleIds)
			.and(wrapper -> wrapper
			.isNull(InsProduct::getInsResult)
			.or()
			.eq(InsProduct::getInsResult, 2)
			)
			//.isNull(InsProduct::getInsResult)
			.eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory())
			.eq(InsProduct::getState, 1));
			if (count == 0) {
			insOrderStateMapper.update(new InsOrderState(), Wrappers.<InsOrderState>lambdaUpdate()
			.eq(InsOrderState::getInsOrderId, orderId)
			@@ -943,8 +1025,48 @@
			textRenderData.setText("√");
			break;
			case 0:
			resultCh.set(resultCh.get() + "、" + p.getInspectionItem() + (Objects.equals(p.getInspectionItemSubclass(), "") ? "" : " " + p.getInspectionItemSubclass()));
			resultEn.set(resultEn.get() + "、" + p.getInspectionItemEn() + ((Objects.equals(p.getInspectionItemSubclassEn(), "") \|\| Objects.equals(p.getInspectionItemSubclassEn(), null)) ? "" : " " + p.getInspectionItemSubclassEn()));
			String current = resultCh.get();
			// 使用 Set 来保持唯一项
			Set<String> uniqueItems = new HashSet<>();
			if (!current.isEmpty()) {
			// 分割当前字符串并加入到 Set 中
			String[] items = current.split("、");
			for (String item : items) {
			if (!item.isEmpty()) {
			uniqueItems.add(item);
			}
			}
			}
			// 处理新数据
			String newItem = p.getInspectionItem() +
			(Objects.equals(p.getInspectionItemSubclass(), "") ? "" : " " + p.getInspectionItemSubclass());
			uniqueItems.add(newItem);

			// 连接唯一项并更新 AtomicReference
			String result = String.join("、", uniqueItems);
			resultCh.set(result);
			//resultCh.set(resultCh.get() + "、" + p.getInspectionItem() + (Objects.equals(p.getInspectionItemSubclass(), "") ? "" : " " + p.getInspectionItemSubclass()));

			String current1 = resultEn.get();
			// 使用 Set 来保持唯一项
			Set<String> uniqueItems1 = new HashSet<>();
			if (!current1.isEmpty()) {
			// 分割当前字符串并加入到 Set 中
			String[] items = current1.split("、");
			for (String item : items) {
			if (!item.isEmpty()) {
			uniqueItems1.add(item);
			}
			}
			}
			// 处理新数据
			String newItem1 = p.getInspectionItemEn() +
			((Objects.equals(p.getInspectionItemSubclassEn(), "") \|\| Objects.equals(p.getInspectionItemSubclassEn(), null)) ? "" : " " + p.getInspectionItemSubclassEn());
			uniqueItems1.add(newItem1);
			// 连接唯一项并更新 AtomicReference
			String result1 = String.join("、", uniqueItems1);
			resultEn.set(result1);
			//resultEn.set(resultEn.get() + "、" + p.getInspectionItemEn() + ((Objects.equals(p.getInspectionItemSubclassEn(), "") \|\| Objects.equals(p.getInspectionItemSubclassEn(), null)) ? "" : " " + p.getInspectionItemSubclassEn()));
			textRenderData.setText("×");
			break;
			default:
			@@ -1013,7 +1135,7 @@
			textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
			}
			} else {
			textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
			textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "∑" + jo1.get("mc"));
			}
			if (jo1.get("mc") != null) {
			textRenderData.setText(textRenderData.getText() + "∑" + jo1.get("mc"));
			@@ -3519,7 +3641,11 @@
			.in(InsProduct::getInsSampleId, ids)
			.eq(InsProduct::getSonLaboratory, laboratory)
			.eq(InsProduct::getState, 1)
			.isNull(InsProduct::getInsResult)
			.and(wrapper -> wrapper
			.isNull(InsProduct::getInsResult)
			.or()
			.eq(InsProduct::getInsResult, 2)
			)
			.isNull(InsProduct::getInsFiberId)
			.isNull(InsProduct::getInsFibersId));
			insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory));
			@@ -3586,16 +3712,19 @@
			InsSampleUser insSampleUser = new InsSampleUser();
			insSampleUser.setUserId(verifyUser);
			insSampleUser.setInsSampleId(orderId);
			insSampleUser.setState(0);
			insSampleUser.setState(1);
			insSampleUser.setSonLaboratory(laboratory);
			insSampleUserMapper.insert(insSampleUser);
			/校验一下result表/
			CompletableFuture.supplyAsync(() -> {
			List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
			for (Integer ip : ips) {
			List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, ip).orderByDesc(InsProductResult::getId));
			List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
			.eq(InsProductResult::getInsProductId, ip));
			if (insProductResults.size() > 1) {
			insProductResultMapper.deleteById(insProductResults.get(0));
			for (int i = 1; i < insProductResults.size(); i++) {
			insProductResultMapper.deleteById(insProductResults.get(i));
			}
			}
			}
			return null;