tx-lims-after.git

			@@ -8,6 +8,7 @@
			import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
			import com.alibaba.fastjson.JSON;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			@@ -34,6 +35,7 @@
			import java.net.URLEncoder;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.time.format.DateTimeFormatter;
			import java.util.*;
			import java.util.concurrent.atomic.AtomicInteger;
			import java.util.stream.Collectors;
			@@ -56,6 +58,8 @@

			private InsProductMapper insProductMapper;
			private InsProductService insProductService;

			private InsProductUserMapper insProductUserMapper;

			private GiveCode giveCode;

			@@ -205,6 +209,7 @@
			for (BushingDto bushingDto : a.getBushing()) {
			bushingDto.setInsSampleId(a.getId());
			insBushingMapper.insert(bushingDto);
			//光纤不为空
			if (bushingDto.getFiber().size() != 0) {
			for (FiberDto fiberDto : bushingDto.getFiber()) {
			fiberDto.setInsBushingId(bushingDto.getId());
			@@ -212,7 +217,9 @@
			addInsProductMethod(a.getId(), a.getInsProduct(), fiberDto.getId(), 2, true);
			addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2, false);
			}
			} else {
			}
			//光纤带不为空
			else if ( bushingDto.getFibers().size()!=0){
			for (FibersDto fibersDto : bushingDto.getFibers()) {
			fibersDto.setInsBushingId(bushingDto.getId());
			fibersDto.setCode(this.giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
			@@ -225,6 +232,29 @@
			}
			//addInsProductMethod(a.getId(), a.getInsProduct(), fibersDto.getId(), 1);
			addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1, false);
			}
			}
			//都为空只配置了套管这种情况只限于项目是含有松套管的
			else {
			String collect = a.getInsProduct().stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.joining(","));
			if (collect.contains("松套管")){
			//获取检验项目中包含松套管的检验项目
			List<InsProduct> products = a.getInsProduct().stream().filter(insProduct -> insProduct.getInspectionItem().contains("松套管")).collect(Collectors.toList());
			for (InsProduct product : products) {
			product.setInsBushId(bushingDto.getId());
			product.setId(null);
			product.setCreateTime(null);
			product.setUpdateTime(null);
			product.setUpdateTime(null);
			product.setUpdateUser(null);
			product.setInsSampleId(a.getId());
			if (product.getInspectionItemSubclass() == null) {
			product.setInspectionItemSubclass("");
			}
			insProductMapper.insert(product);
			}
			}else {
			throw new ErrorException("样品的光纤配置信息里面没有配置光纤带信息也没有光纤信息,请重新配置保存再提交下单!!!");
			}
			}
			}
			@@ -310,6 +340,9 @@
			InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(sampleId).getInsOrderId());
			String name = insSampleMapper.selMethodById(sampleId);
			for (InsProduct product : productList) {
			if (product.getInspectionItem().contains("松套管")){
			continue;
			}
			if (product.getState() == 1 && !product.getInspectionItem().equals("光纤接头损耗")) {
			//判断光缆的温度循环项目添加
			if (insOrder.getSampleType().equals("光缆") && product.getInspectionItem().equals("温度循环") && type != 0) {
			@@ -422,7 +455,8 @@
			}
			}
			insProductService.saveBatch(insProductess);
			} else {
			}
			else {
			if (!is) {
			switch (type) {
			case 1:
			@@ -546,6 +580,16 @@
			Map<String, Object> map = new HashMap<>();
			InsOrder insOrder = insOrderMapper.selectById(id);
			List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);
			for (SampleProductDto sampleProductDto : list) {
			List<Integer> ids = sampleProductDto.getInsProduct().stream().map(InsProduct::getId).collect(Collectors.toList());
			List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()
			.in(InsProductUser::getInsProductId, ids));
			if (CollectionUtils.isNotEmpty(insProductUsers)) {
			List<Integer> userIds = insProductUsers.stream().map(InsProductUser::getCreateUser).distinct().collect(Collectors.toList());
			String collect = userMapper.selectBatchIds(userIds).stream().map(User::getName).collect(Collectors.joining(","));
			sampleProductDto.setCheckName(collect);
			}
			}
			map.put("insOrder", insOrder);
			map.put("sampleProduct", list);
			//查询所有记录模版去重
			@@ -558,7 +602,19 @@
			public Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto) {
			Map<String, Object> map = new HashMap<>();
			map.put("head", PrintChina.printChina(SampleProductDto2.class));
			map.put("body", insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto)));
			IPage<SampleProductDto2> productDto2IPage = insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto));
			for (SampleProductDto2 record : productDto2IPage.getRecords()) {
			InsProductUser insProductUser = insProductUserMapper.selectOne(Wrappers.<InsProductUser>lambdaQuery()
			.eq(InsProductUser::getInsProductId, record.getInsProductId())
			.orderByDesc(InsProductUser::getCreateTime)
			.last("limit 1"));
			if (ObjectUtils.isNotEmpty(insProductUser)){
			record.setCheckName(userMapper.selectById(insProductUser.getCreateUser()).getName());
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			record.setCheckTime(insProductUser.getCreateTime().format(formatter));
			}
			}
			map.put("body",productDto2IPage);
			return map;
			}