tx-lims-after.git

			@@ -25,10 +25,7 @@
			import com.deepoove.poi.xwpf.WidthScalePattern;
			import com.yuanchu.mom.common.GetLook;
			import com.yuanchu.mom.common.PrintChina;
			import com.yuanchu.mom.dto.BushingDto;
			import com.yuanchu.mom.dto.ExcelDto;
			import com.yuanchu.mom.dto.InsOrderPlanDTO;
			import com.yuanchu.mom.dto.SampleProductDto;
			import com.yuanchu.mom.dto.*;
			import com.yuanchu.mom.exception.ErrorException;
			import com.yuanchu.mom.mapper.*;
			import com.yuanchu.mom.pojo.*;
			@@ -271,11 +268,11 @@

			//切换记录模版查询检验内容
			@Override
			public Map<String, Object> getReportModel(Integer orderId) {
			public Map<String, Object> getReportModel(Integer sampleId) {
			Map<String, Object> map = new HashMap<>();
			List<Integer> insSampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
			//List<Integer> insSampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
			//先查出套管
			List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().in(InsBushing::getInsSampleId, insSampleIds));
			List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
			List<InsFibers> fibers = new ArrayList<>();
			List<InsFiber> fiber = new ArrayList<>();
			for (InsBushing insBushing : insBushings) {
			@@ -296,6 +293,9 @@
			map.put("光纤",fiber);
			return map;
			}




			@Override
			public void saveInsContext(Map<String, Object> insContext) {
			@@ -897,7 +897,7 @@
			//第一行
			if (j == 0) {
			//第一列
			textRenderData.setText("管色标Pipe∑100");
			textRenderData.setText("管色标\r\nPipe∑100");
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			paragraphRenderDataList.add(paragraphRenderData);