Commit 2d3f78fb by wangweidong

土工平台修改

parent c25c3328
...@@ -680,7 +680,7 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi ...@@ -680,7 +680,7 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
} }
for (SoilExperiment experiment : experimentListDb) { for (SoilExperiment experiment : experimentListDb) {
if (groupAndSampleMap.containsKey(experiment.getSampleId()+"--"+experiment.getGroupId())){ if (groupAndSampleMap.containsKey(experiment.getSampleId()+"--"+experiment.getGroupId())){
List<SoilExperiment> soilExperimentList = groupSampleMap.get(experiment.getSampleId()+"--"+experiment.getGroupId()); List<SoilExperiment> soilExperimentList = groupAndSampleMap.get(experiment.getSampleId()+"--"+experiment.getGroupId());
soilExperimentList.add(experiment); soilExperimentList.add(experiment);
groupAndSampleMap.put(experiment.getSampleId()+"--"+experiment.getGroupId(),soilExperimentList); groupAndSampleMap.put(experiment.getSampleId()+"--"+experiment.getGroupId(),soilExperimentList);
}else { }else {
...@@ -725,7 +725,7 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi ...@@ -725,7 +725,7 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
sbName.append(experiment.getName()).append("、"); sbName.append(experiment.getName()).append("、");
} }
if (StringUtils.isNotBlank(experiment.getShortName())){ if (StringUtils.isNotBlank(experiment.getShortName())){
sbName.append(experiment.getShortName()).append("、"); sbShortName.append(experiment.getShortName()).append("、");
} }
} }
prepare.setItemNames(StringHandleUtils.getExcepLastOne(sbName.toString())); prepare.setItemNames(StringHandleUtils.getExcepLastOne(sbName.toString()));
......
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