tx-lims-after.git

			@@ -2328,7 +2328,8 @@
			}
			result2VOS.add(insProductResult2VO1);
			}
			} else {
			}
			else {
			insProductResult2VO.setValue(value.replace("\"", ""));
			result2VOS.add(insProductResult2VO);
			}
			@@ -2837,7 +2838,7 @@
			//辐射的标题
			String title3 = "";
			if (radiationReportNum > 0) {
			title3 = "辐射方向图参数";
			title3 = "辐射性能参数";
			}
			//环境表格
			List<Map<String, Object>> tables4 = new ArrayList<>();
			@@ -3268,7 +3269,7 @@
			private void getWord1(String term, InsOrderState insOrderState, List<Map<String, Object>> tables2) {
			AtomicInteger lable = new AtomicInteger(1);
			AtomicInteger index = new AtomicInteger();
			String title = term + "电路参数";
			String title = term + "电性能参数";
			InsSample insSample = insSampleMapper.selectById(insOrderState.getInsSampleId());
			//查询项目
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			@@ -3585,8 +3586,9 @@
			if (i % 2 == 0) {
			//最差值
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			String text = value.split(",")[(j - 5) + (i - 1) / 2 * (Math.min(ports, 8))];
			try {
			textRenderData.setText(value.split(",")[(j - 5) + (i - 1) / 2 * (Math.min(ports, 8))]);
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3674,7 +3676,8 @@
			} else if (j % 2 == 0) {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - cc - 1) * 4] + "∑5" + i + (j - 6));
			String text = value.split(",")[(j - 6) / 2 + (i - cc - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3686,7 +3689,8 @@
			} else {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - cc - 1) * 4] + "∑5" + i + (j - 5));
			String text = value.split(",")[(j - 5) / 2 + (i - cc - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3766,7 +3770,8 @@
			} else if (j % 2 == 0) {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4] + "∑5" + i + (j - 6));
			String text = value.split(",")[(j - 6) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3778,7 +3783,8 @@
			} else {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4] + "∑5" + i + (j - 5));
			String text = value.split(",")[(j - 5) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3858,7 +3864,8 @@
			} else if (j % 2 == 0) {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4] + "∑5" + i + (j - 6));
			String text = value.split(",")[(j - 6) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3870,7 +3877,8 @@
			} else {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4] + "∑5" + i + (j - 5));
			String text = value.split(",")[(j - 5) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3950,7 +3958,8 @@
			} else if (j % 2 == 0) {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4] + "∑5" + i + (j - 6));
			String text = value.split(",")[(j - 6) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3962,7 +3971,8 @@
			} else {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4] + "∑5" + i + (j - 5));
			String text = value.split(",")[(j - 5) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4053,7 +4063,8 @@
			String[] value = result2s.get((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) / portRow / (angles + 2)).getValue().split("\\],\\[");
			String[] split = value[(i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 2) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))]);
			String text = split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4157,7 +4168,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i + (angles - 1)) / (angles + 1) - 1) * (Math.min(ports, 8))]);
			String text = split[(j - 5) + ((i + (angles - 1)) / (angles + 1) - 1) * (Math.min(ports, 8))];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4272,13 +4284,15 @@
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			if (j % 2 == 0) {
			try {
			textRenderData.setText(split[(j - 6) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 6));
			String text = split[(j - 6) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			} else {
			try {
			textRenderData.setText(split[(j - 5) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 5));
			String text = split[(j - 5) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4395,13 +4409,15 @@
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			if (j % 2 == 0) {
			try {
			textRenderData.setText(split[(j - 6) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 6));
			String text = split[(j - 6) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			} else {
			try {
			textRenderData.setText(split[(j - 5) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 5));
			String text = split[(j - 5) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4518,13 +4534,15 @@
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			if (j % 2 == 0) {
			try {
			textRenderData.setText(split[(j - 6) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 6));
			String text = split[(j - 6) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			} else {
			try {
			textRenderData.setText(split[(j - 5) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 5));
			String text = split[(j - 5) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4640,13 +4658,15 @@
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			if (j % 2 == 0) {
			try {
			textRenderData.setText(split[(j - 6) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 6));
			String text = split[(j - 6) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			} else {
			try {
			textRenderData.setText(split[(j - 5) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 5));
			String text = split[(j - 5) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4745,7 +4765,8 @@
			String[] value = result2s.get((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) / portRow / (angles + 2)).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))]);
			String text = split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4841,7 +4862,8 @@
			//最差值
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			textRenderData.setText(split[0] + "∑7" + i);
			String text = split[0];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑7" + i);
			}
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			@@ -4934,7 +4956,8 @@
			//最差值
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			textRenderData.setText(split[0] + "∑7" + i);
			String text = split[0];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑7" + i);
			}
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			@@ -5036,7 +5059,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i - (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn)) / (angles + 2)) * Math.min(length, 8)]);
			String text = split[(j - 5) + ((i - (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn)) / (angles + 2)) * Math.min(length, 8)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -5143,7 +5167,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i - (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp)) / (angles + 2)) * Math.min(length, 8)]);
			String text = split[(j - 5) + ((i - (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp)) / (angles + 2)) * Math.min(length, 8)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -5250,7 +5275,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i - rr) / (angles + 2)) * Math.min(length, 8)]);
			String text = split[(j - 5) + ((i - rr) / (angles + 2)) * Math.min(length, 8)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -5356,7 +5382,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i - ss) / (angles + 2)) * Math.min(length, 8)]);
			String text = split[(j - 5) + ((i - ss) / (angles + 2)) * Math.min(length, 8)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -5409,7 +5436,7 @@
			//电路报告用于总报告的方法(无源器件)
			private void getWord2(String term, InsOrderState insOrderState, List<Map<String, Object>> tables2) {
			AtomicInteger index = new AtomicInteger();
			String title = term + "电路参数";
			String title = term + "电性能参数";
			//查询样品
			InsSample insSample = insSampleMapper.selectById(insOrderState.getInsSampleId());
			//查询项目
			@@ -5441,7 +5468,7 @@
			List<RowRenderData> rows = new ArrayList<>();
			Set<String> itemSet = new HashSet<>();
			//表格的行数
			for (int i = 0; i < result2VOS.size()+1; i++) {
			for (int i = 0; i < result2VOS.size(); i++) {
			RowRenderData rowRenderData = new RowRenderData();
			RowStyle rowStyle = new RowStyle();
			rowStyle.setHeight(40);