Commit d40b1076 by wangweidong

土工平台修改

parent 5bb9deda
...@@ -2555,7 +2555,13 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -2555,7 +2555,13 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
String name = smbFile.getOriginalFilename(); String name = smbFile.getOriginalFilename();
if (name.contains(type.getExperiment())){ String expname= type.getExperiment();
if (expname.contains("三轴压缩")&&(!expname.contains("重塑"))){
expname="三轴压缩";
}else if (expname.contains("三轴压缩")&&(expname.contains("三轴压缩"))){
expname="三轴压缩重塑";
}
if (name.contains(expname)){
SoilSample sample = soilSampleService.getBySampleCode(type.getSampleCode()); SoilSample sample = soilSampleService.getBySampleCode(type.getSampleCode());
if (null !=sample){ if (null !=sample){
XSSFWorkbook xssfWorkbook= exportService.getXSSFWorkbook("AttachmentTemplateSZYS.xlsx"); XSSFWorkbook xssfWorkbook= exportService.getXSSFWorkbook("AttachmentTemplateSZYS.xlsx");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment