tx-lims-after.git

			@@ -33,6 +33,7 @@
			import com.yuanchu.mom.utils.JackSonUtil;
			import com.yuanchu.mom.utils.MatrixToImageWriter;
			import com.yuanchu.mom.utils.QueryWrappers;
			import com.yuanchu.mom.utils.RedisUtil;
			import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
			import com.yuanchu.mom.vo.InsOrderPlanVO;
			import com.yuanchu.mom.vo.ProductVo;
			@@ -136,12 +137,14 @@
			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);
			String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//试验室
			IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId,sonLaboratory);
			map.put("body", insOrderPage);
			return map;
			}
			@@ -155,11 +158,13 @@
			if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
			insOrderPlanDTO.setUserId(userId.longValue());
			}
			IPage<InsOrderPlanTaskSwitchVo> insOrderPage = insSampleMapper.inspectionOrderDetailsTaskSwitching(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
			String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//试验室
			IPage<InsOrderPlanTaskSwitchVo> insOrderPage = insSampleMapper.inspectionOrderDetailsTaskSwitching(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId,sonLaboratory);
			map.put("body", insOrderPage);
			return map;
			}

			//认领任务
			@Override
			public boolean claimInsOrderPlan(InsOrderPlanDTO entity) {
			if (Objects.isNull(entity)) {
			@@ -167,7 +172,7 @@
			}
			Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
			Integer userId = map1.get("userId");
			InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1);
			InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1,entity.getSonLaboratory());
			return insSampleUserMapper.insert(insSampleUser) > 0;
			}

			@@ -217,7 +222,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();
			@@ -283,13 +292,40 @@
			//再查询出所有的光纤带
			List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::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());
			if (insProducts.size()==collect.size()) {
			insFiber.setState(1);//已检验
			}else {
			insFiber.setState(0);//未检验
			}
			}
			fibers.addAll(insFibers);
			//查出光纤带下所有的光纤
			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());
			if (insProducts.size()==collect.size()) {
			insFiber.setState(1);//已检验
			}else {
			insFiber.setState(0);//未检验
			}
			}
			fiber.addAll(fiberList);
			} else {
			//如果套管下没有光纤带就只有光纤了
			List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
			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());
			if (insProducts.size()==collect.size()) {
			insFiber.setState(1);//已检验
			}else {
			insFiber.setState(0);//未检验
			}
			}
			fiber.addAll(insFiberList);
			}
			}
			@@ -309,14 +345,50 @@
			//先查出这个样品下有哪些管色标,光纤带,光纤色标
			//先查出套管
			List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
			for (InsBushing insBushing : insBushings) {
			//再查询出所有的光纤带
			List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
			if (CollectionUtils.isNotEmpty(insFibers)) {
			for (InsFibers insFiber : insFibers) {
			//查出光纤带下所有的光纤
			List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsFibersId, insFiber.getId()));
			for (InsFiber fiber : fiberList) {
			if (insBushings.size()>0) {
			//通信--温度循环
			for (InsBushing insBushing : insBushings) {
			//再查询出所有的光纤带
			List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
			if (CollectionUtils.isNotEmpty(insFibers)) {
			for (InsFibers insFiber : insFibers) {
			//查出光纤带下所有的光纤
			List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsFibersId, insFiber.getId()));
			for (InsFiber fiber : fiberList) {
			//再根据关联的光纤配置的id和循环次数和温度和样品id进行查询检验项目
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsSampleId, sampleId)
			.eq(InsProduct::getInspectionItem, inspectionItem)
			.eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
			.eq(InsProduct::getInsFiberId, fiber.getId()));
			for (InsProduct insProduct : insProducts) {
			InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
			ProductVo productVo = new ProductVo();
			productVo.setCode(insFiber.getCode());
			productVo.setColor(fiber.getColor());
			productVo.setBushColor(fiber.getBushColor());
			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);
			}
			}
			}
			} else {
			//如果套管下没有光纤带就只有光纤了
			List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
			for (InsFiber fiber : insFiberList) {
			//再根据关联的光纤配置的id和循环次数和温度和样品id进行查询检验项目
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsSampleId, sampleId)
			@@ -326,38 +398,41 @@
			for (InsProduct insProduct : insProducts) {
			InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
			ProductVo productVo = new ProductVo();
			productVo.setCode(insFiber.getCode());
			productVo.setCode("/");
			productVo.setColor(fiber.getColor());
			productVo.setBushColor(fiber.getBushColor());
			if (ObjectUtils.isNotEmpty(insProductResult)) {
			insProduct.setInsProductResult(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);
			}
			}
			}
			} else {
			//如果套管下没有光纤带就只有光纤了
			List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
			for (InsFiber fiber : insFiberList) {
			//再根据关联的光纤配置的id和循环次数和温度和样品id进行查询检验项目
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsSampleId, sampleId)
			.eq(InsProduct::getInspectionItem, inspectionItem)
			.eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
			.eq(InsProduct::getInsFiberId, fiber.getId()));
			for (InsProduct insProduct : insProducts) {
			InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
			ProductVo productVo = new ProductVo();
			productVo.setCode("/");
			productVo.setColor(fiber.getColor());
			productVo.setBushColor(fiber.getBushColor());
			insProduct.setInsProductResult(insProductResult);
			productVo.setInsProduct(insProduct);
			productVos.add(productVo);
			}
			}
			productVos = productVos.stream().sorted(Comparator.comparing(productVo -> productVo.getInsProduct().getInspectionItemClass())).collect(Collectors.toList());
			}
			else {
			//电力--热循环和温升试验
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsSampleId, sampleId)
			.eq(InsProduct::getInspectionItem, inspectionItem));
			for (InsProduct insProduct : insProducts) {
			InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
			ProductVo productVo = new ProductVo();
			if (ObjectUtils.isNotEmpty(insProductResult)) {
			insProduct.setInsProductResult(insProductResult);
			}
			productVo.setInsProduct(insProduct);
			productVos.add(productVo);
			}
			}
			map.put("productVos", productVos);
			@@ -388,6 +463,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 + "");
			@@ -467,12 +544,15 @@
			//校验如果这个人这个检测项目已经添加过了则不需要再新增
			Long count = auxiliaryOutputWorkingHoursMapper.selectCount(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
			.eq(AuxiliaryOutputWorkingHours::getCheck, userId)
			.eq(AuxiliaryOutputWorkingHours::getInspectProject, insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem())
			.eq(AuxiliaryOutputWorkingHours::getInspectionItem, insProduct.getInspectionItem())
			.eq(AuxiliaryOutputWorkingHours::getInspectionItemSubclass, insProduct.getInspectionItemSubclass())
			.eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode()));
			if (count == 0 && ObjectUtils.isNotEmpty(insProduct.getManHour())) {
			//添加每个人的产量工时
			//添加每个人的产量工时,要判断当前时间是否是这个人的排班时间,如果不是则是加班
			AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
			auxiliaryOutputWorkingHours.setInspectProject(insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem());//检测项目
			auxiliaryOutputWorkingHours.setInspectionItem(insProduct.getInspectionItem());//检测父项
			auxiliaryOutputWorkingHours.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());//检测子项
			auxiliaryOutputWorkingHours.setSample(insSampleMapper.selectById(insProduct.getInsSampleId()).getSampleCode());//样品编号
			auxiliaryOutputWorkingHours.setOrderNo(insOrder.getEntrustCode());//非加班委托单号
			auxiliaryOutputWorkingHours.setWorkTime(insProduct.getManHour());//非加班工时
			auxiliaryOutputWorkingHours.setAmount(1);//非加班数量
			@@ -531,12 +611,14 @@
			});
			}

			//交接
			@Override
			public int upPlanUser(Integer userId, Integer orderId) {
			public int upPlanUser(Integer userId, Integer orderId,String sonLaboratory) {
			InsSampleUser insSampleUser = new InsSampleUser();
			insSampleUser.setUserId(userId);
			insSampleUser.setInsSampleId(orderId);
			insSampleUser.setState(0);
			insSampleUser.setSonLaboratory(sonLaboratory);
			return insSampleUserMapper.insert(insSampleUser);
			}

			@@ -914,8 +996,9 @@
			for (long i = 0; i < size; i++) {
			if (i % number == 0) {
			List<RowRenderData> rows = new ArrayList<>();
			//表格的行数 √ ✖ ✔
			for (int j = 0; j < number + 3; j++) {
			//表格的行数 × √ ✖ ✔
			long count1 = size-(index-1)number < number ? size-(index-1)number + 3 : number + 3;
			for (int j = 0; j <count1 ; j++) {
			RowRenderData rowRenderData = new RowRenderData();
			RowStyle rowStyle = new RowStyle();
			rowStyle.setHeight(40);
			@@ -957,7 +1040,6 @@
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}

			}
			else if (j == 1) {
			//第二行
			@@ -1003,7 +1085,7 @@
			cells.add(cellRenderData);
			}
			}
			else if (j == number + 2) {
			else if (j == count1-1) {
			//最后一行
			if (k == 0 \|\| k == 1) {
			//前两列
			@@ -1014,7 +1096,7 @@
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			} else {
			textRenderData.setText("“✔”表示项目合格，“✖”表示项目不合格@“✔”indicates test Item is qualified，“✖”indicates test Item is unqualified∑19");
			textRenderData.setText("“√”表示项目合格，“×”表示项目不合格@“√”indicates test Item is qualified，“×”indicates test Item is unqualified∑19");
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			paragraphRenderDataList.add(paragraphRenderData);
			@@ -1031,10 +1113,14 @@
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else if (k == 1) {
			} else if (k == 1) {
			//第二列
			String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			String insProduct;
			try {
			insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			} catch (Exception e) {
			continue;
			}
			String[] split = insProduct.split(",");
			if (ObjectUtils.isEmpty(split[1]) \|\| split[1].equals("")) {
			textRenderData.setText(split[0]);
			@@ -1046,11 +1132,15 @@
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else if (k == 2) {
			} else if (k == 2) {
			//第三列
			//先判断检验项是否有子类
			String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			String insProduct;
			try {
			insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			} catch (Exception e) {
			continue;
			}
			String[] split = insProduct.split(",");
			if (ObjectUtils.isEmpty(split[2]) \|\| split[2].equals("")) {
			//如果没有子类
			@@ -1069,11 +1159,15 @@
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else if (k == 3) {
			} else if (k == 3) {
			//第四列
			//先判断检验项是否有子类
			String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			String insProduct;
			try {
			insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			} catch (Exception e) {
			continue;
			}
			String[] split = insProduct.split(",");
			if (ObjectUtils.isEmpty(split[2]) \|\| split[2].equals("")) {
			//如果没有子类
			@@ -1087,10 +1181,14 @@
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else if (k == 4) {
			} else if (k == 4) {
			//第五列
			String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			String insProduct;
			try {
			insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			} catch (Exception e) {
			continue;
			}
			String[] split = insProduct.split(",");
			//查询所有样品该检验项的检验结果(最终值)
			List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			@@ -1105,16 +1203,20 @@
			Optional<String> min = products.stream().map(InsProduct::getLastValue)
			.filter(value -> !value.isEmpty())
			.min(String::compareTo);
			textRenderData.setText(min+"-"+max);//检验结果
			textRenderData.setText(min.get() + "-" + max.get());//检验结果
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else {
			} else {
			//最后一列
			String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			String insProduct;
			try {
			insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
			} catch (Exception e) {
			continue;
			}
			String[] split = insProduct.split(",");
			//查询所有样品该检验项的检验结论(ins_result)
			List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			@@ -1125,10 +1227,10 @@
			List<Integer> result = products.stream().map(InsProduct::getInsResult).distinct().collect(Collectors.toList());
			if (result.size() == 1 && result.contains(1)) {
			//合格
			textRenderData.setText("✔");
			}else {
			textRenderData.setText("√");
			} else {
			//不合格
			textRenderData.setText("✖");
			textRenderData.setText("×");
			}
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			@@ -1152,7 +1254,7 @@
			}
			System.out.println("");*/
			if (row.getCells().size() != countSize) {
			throw new ErrorException("每行单元格不相等");
			throw new ErrorException("每行单元格不相等1");
			}
			}
			TableStyle tableStyle = new TableStyle();
			@@ -1178,7 +1280,7 @@
			long index4 = 1;
			//检验报告报告(当检验项目超过7个新建表)
			for (long j = 0; j < size; j++) {
			if (j%number2==0){
			if (j % number2 == 0) {
			List<RowRenderData> rows = new ArrayList<>();
			//表格的行数(根据样品数量来)
			for (int i = 0; i < samples.size() + 2; i++) {
			@@ -1204,9 +1306,9 @@
			style.setFontFamily("宋体");
			style.setColor("000000");
			textRenderData.setStyle(style);
			if (i==0){
			if (i == 0) {
			//第一行
			if (k==0){
			if (k == 0) {
			//第一列
			textRenderData.setText("样品编号@Sample number∑30");
			renderData.add(textRenderData);
			@@ -1214,22 +1316,26 @@
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else {
			} else {
			//第二列
			String product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
			String product;
			try {
			product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
			} catch (Exception e) {
			continue;
			}
			String[] split = product.split(",");
			if (ObjectUtils.isEmpty(split[2])\|\|split[2].equals("")){
			if (ObjectUtils.isEmpty(split[1]) \|\| split[1].equals("")){
			textRenderData.setText(split[0]+"∑3"+k);
			}else {
			textRenderData.setText(split[0]+"@"+split[1]+"∑3"+k);
			if (ObjectUtils.isEmpty(split[2]) \|\| split[2].equals("")) {
			if (ObjectUtils.isEmpty(split[1]) \|\| split[1].equals("")) {
			textRenderData.setText(split[0] + "∑3" + k);
			} else {
			textRenderData.setText(split[0] + "@" + split[1] + "∑3" + k);
			}
			}else {
			if (ObjectUtils.isEmpty(split[1]) \|\| split[1].equals("")){
			} else {
			if (ObjectUtils.isEmpty(split[1]) \|\| split[1].equals("")) {
			textRenderData.setText(split[0]);
			}else {
			textRenderData.setText(split[0]+"@"+split[1]);
			} else {
			textRenderData.setText(split[0] + "@" + split[1]);
			}
			}
			renderData.add(textRenderData);
			@@ -1238,10 +1344,9 @@
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			}
			else if (i==1){
			} else if (i == 1) {
			//第二行
			if (k==0){
			if (k == 0) {
			//第一列
			textRenderData.setText("样品编号@Sample number∑30");
			renderData.add(textRenderData);
			@@ -1249,22 +1354,26 @@
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else {
			} else {
			//第二列
			String product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
			String product;
			try {
			product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
			} catch (Exception e) {
			continue;
			}
			String[] split = product.split(",");
			if (ObjectUtils.isEmpty(split[2])\|\|split[2].equals("")){
			if (ObjectUtils.isEmpty(split[1]) \|\| split[1].equals("")){
			textRenderData.setText(split[0]+"∑3"+k);
			}else {
			textRenderData.setText(split[0]+"@"+split[1]+"∑3"+k);
			if (ObjectUtils.isEmpty(split[2]) \|\| split[2].equals("")) {
			if (ObjectUtils.isEmpty(split[1]) \|\| split[1].equals("")) {
			textRenderData.setText(split[0] + "∑3" + k);
			} else {
			textRenderData.setText(split[0] + "@" + split[1] + "∑3" + k);
			}
			}else {
			if (ObjectUtils.isEmpty(split[3]) \|\| split[3].equals("")){
			} else {
			if (ObjectUtils.isEmpty(split[3]) \|\| split[3].equals("")) {
			textRenderData.setText(split[2]);
			}else {
			textRenderData.setText(split[2]+"@"+split[3]);
			} else {
			textRenderData.setText(split[2] + "@" + split[3]);
			}
			}
			renderData.add(textRenderData);
			@@ -1273,27 +1382,30 @@
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			}
			else {
			if (k==0){
			} else {
			if (k == 0) {
			//第一列
			textRenderData.setText(samples.get(i-2).getSampleCode());
			textRenderData.setText(samples.get(i - 2).getSampleCode());
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else {
			} else {
			//根据样品编号和项目去查询最终值
			String product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
			String product;
			try {
			product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
			} catch (Exception e) {
			continue;
			}
			String[] split = product.split(",");
			InsProduct insProduct = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getState, 1)
			.eq(InsProduct::getInsSampleId, samples.get(i - 2).getId())
			.eq(InsProduct::getInspectionItem, split[0])
			.eq(InsProduct::getInspectionItemSubclass, split[2]));
			if (ObjectUtils.isEmpty(insProduct)){
			if (ObjectUtils.isEmpty(insProduct)) {
			//可能根据正常的样品编号和光纤接头损耗的项目查不到对应的项目,则需要根据"/"来查
			List<InsSample> sampleList = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().like(InsSample::getSampleCode, samples.get(i - 2).getSampleCode()));
			List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			@@ -1301,7 +1413,7 @@
			.in(InsProduct::getInsSampleId, sampleList.stream().map(InsSample::getId).collect(Collectors.toList()))
			.eq(InsProduct::getInspectionItem, split[0])
			.eq(InsProduct::getInspectionItemSubclass, split[2]));
			insProduct=products.get(0);
			insProduct = products.get(0);
			}
			textRenderData.setText(insProduct.getLastValue());
			renderData.add(textRenderData);
			@@ -1327,7 +1439,7 @@
			}
			System.out.println("");*/
			if (row.getCells().size() != countSize) {
			throw new ErrorException("每行单元格不相等");
			throw new ErrorException("每行单元格不相等2");
			}
			}
			TableStyle tableStyle = new TableStyle();
			@@ -1355,12 +1467,14 @@
			List<InsSample> sampleList = insSamples.stream().filter(insSample -> insSample.getSampleCode().contains("/")).collect(Collectors.toList());
			//过滤出光纤接头损耗的检验项目
			List<String> strings = filteredProducts.stream().filter(s -> s.contains("光纤接头损耗")).distinct().collect(Collectors.toList());
			long index41 = 1;
			for (int i = 0; i < sampleList.size(); i++) {
			if (i%16==0){
			if (i % 16 == 0) {
			//样品数量超过16需要新增表格
			List<RowRenderData> rows = new ArrayList<>();
			int count2 = sampleList.size()-(index41-1)16 < 16 ? (int) (sampleList.size() - (index41 - 1) 16 + 1) : 17;
			//表格的行数
			for (int j = 0; j < 17; j++) {
			for (int j = 0; j < count2; j++) {
			RowRenderData rowRenderData = new RowRenderData();
			RowStyle rowStyle = new RowStyle();
			rowStyle.setHeight(40);
			@@ -1383,9 +1497,9 @@
			style.setFontFamily("宋体");
			style.setColor("000000");
			textRenderData.setStyle(style);
			if (j==0){
			if (j == 0) {
			//第一行
			if (k==0){
			if (k == 0) {
			//第一列
			textRenderData.setText("光纤类型@Fiber type");
			renderData.add(textRenderData);
			@@ -1393,7 +1507,7 @@
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}else if (k==1 \|\| k==2){
			} else if (k == 1 \|\| k == 2) {
			//第二三列
			textRenderData.setText("样品编号@Sample number");
			renderData.add(textRenderData);
			@@ -1401,12 +1515,12 @@
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}else {
			} else {
			String[] split = strings.get(k - 3).split(",");
			if (ObjectUtils.isEmpty(split[3])\|\| split[3].equals("")){
			if (ObjectUtils.isEmpty(split[3]) \|\| split[3].equals("")) {
			textRenderData.setText(split[2]);
			}else {
			textRenderData.setText(split[2]+"@"+split[3]);
			} else {
			textRenderData.setText(split[2] + "@" + split[3]);
			}
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			@@ -1416,34 +1530,31 @@
			}
			}
			else {
			if (k==0){
			if (k == 0) {
			//第一列
			textRenderData.setText(sampleList.get(0).getSampleCode()+"∑44");
			textRenderData.setText(sampleList.get(0).getModel() + "∑44");
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else if (k==1){
			} else if (k == 1) {
			//第二列
			textRenderData.setText(sampleList.get(j-1).getSampleCode().split("/")[0]);
			textRenderData.setText(sampleList.get(j - 1).getSampleCode().split("/")[0]);
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else if (k==2){
			} else if (k == 2) {
			//第三列
			textRenderData.setText(sampleList.get(j-1).getSampleCode().split("/")[1]);
			textRenderData.setText(sampleList.get(j - 1).getSampleCode().split("/")[1]);
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			paragraphRenderDataList.add(paragraphRenderData);
			cellRenderData.setParagraphs(paragraphRenderDataList);
			cells.add(cellRenderData);
			}
			else {
			} else {
			//根据对应的样品编号和检验项目查询对应数据(最终值)
			String[] split = strings.get(k - 3).split(",");
			InsProduct insProduct = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
			@@ -1474,7 +1585,7 @@
			}
			System.out.println("");*/
			if (row.getCells().size() != countSize) {
			throw new ErrorException("每行单元格不相等");
			throw new ErrorException("每行单元格不相等3");
			}
			}
			TableStyle tableStyle = new TableStyle();
			@@ -1492,9 +1603,10 @@
			Map<String, Object> table = new HashMap<>();
			table.put("table4", tableRenderData);
			table.put("report", insReport);
			table.put("index4", index4+1);
			table.put("index4", index4 + 1);
			tables4.add(table);
			index4++;
			index41++;
			}
			}
			tables4.forEach(table4 -> {
			@@ -1554,6 +1666,9 @@
			try {
			signatureUrl = userMapper.selectById(userId).getSignatureUrl();
			} catch (Exception e) {
			throw new ErrorException("找不到检验人的签名");
			}
			if (signatureUrl.equals("")) {
			throw new ErrorException("找不到检验人的签名");
			}
			//Custom custom = customMapper.selectById(user.get("company"));
			@@ -1762,7 +1877,7 @@
			}
			System.out.println("");*/
			if (row.getCells().size() != countSize) {
			throw new ErrorException("每行单元格不相等");
			throw new ErrorException("每行单元格不相等4");
			}
			}
			TableStyle tableStyle = new TableStyle();
			@@ -2200,8 +2315,7 @@
			if (rowRenderData.getCells().size() != 0) {
			rows.add(rowRenderData);
			}
			}
			else {
			} else {
			//如果有多次循环
			if (i == 0) {
			//第一次循环的列数,那么列数包括20℃常温(2 * (size-nm.size()) -nm.size()+1)
			@@ -3044,7 +3158,7 @@
			}
			System.out.println("");*/
			if (row.getCells().size() != countSize) {
			throw new ErrorException("每行单元格不相等");
			throw new ErrorException("每行单元格不相等5");
			}
			}
			TableStyle tableStyle = new TableStyle();
			@@ -3260,7 +3374,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")));
			@@ -3276,10 +3389,16 @@
			}

			@Override
			public int submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
			public int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode) {
			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 = "";
			@@ -3301,7 +3420,26 @@
			product.setInsResult(1);
			}
			insProductMapper.updateById(product);
			} else {
			}
			//如果是热循环或者是温升试验
			else if (product.getInspectionItem().equals("热循环") \|\| product.getInspectionItem().equals("温升试验")){
			//查询这些项目下的其他检验项目是否全部检验
			List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			.eq(InsProduct::getInsSampleId, product.getInsSampleId())
			.like(InsProduct::getInspectionItemSubclass, "温度"));
			List<Integer> collect = insProductList.stream().filter(insProduct -> insProduct.getInsResult() != null).map(InsProduct::getInsResult).collect(Collectors.toList());
			List<Integer> tt = new ArrayList<>();
			tt.add(1);
			if (collect.contains(0)) {
			product.setLastValue("不合格");
			product.setInsResult(0);
			} else if (collect.size() == insProductList.size() && collect.stream().distinct().collect(Collectors.toList()).containsAll(tt)) {
			product.setLastValue("合格");
			product.setInsResult(1);
			}
			insProductMapper.updateById(product);
			}
			else {
			count++;
			str += "<br/>" + count + "：" + product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "<br/>";
			}
			@@ -3322,7 +3460,13 @@
			info.setViewStatus(false);
			info.setJumpPath("b1-inspect-order-plan");
			informationNotificationService.addInformationNotification(info);
			upPlanUser(verifyUser, orderId);
			//复核人--检验单相关负责人
			InsSampleUser insSampleUser = new InsSampleUser();
			insSampleUser.setUserId(verifyUser);
			insSampleUser.setInsSampleId(orderId);
			insSampleUser.setState(0);
			insSampleUser.setSonLaboratory(laboratory);
			insSampleUserMapper.insert(insSampleUser);
			/校验一下result表/
			CompletableFuture.supplyAsync(() -> {
			List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
			@@ -3334,6 +3478,9 @@
			}
			return null;
			});
			// 删除数采采集次数
			String key = "frequency" + ":" + entrustCode + ":" + sampleCode;
			RedisUtil.del(key);
			return 1;
			}

			@@ -3362,7 +3509,7 @@
			calendar.setTime(date);
			int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
			int day = calendar.get(Calendar.DAY_OF_MONTH);
			return day + " " + getWeekDay(dayOfWeek);
			return getWeekDay(dayOfWeek);
			} catch (Exception e) {
			e.printStackTrace();
			}