土工平台修改

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSampleServiceImpl.java

@@ -645,13 +645,13 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
      @Override
      public List<SoilPrepareVO> obtainPrepareData(Long[] ids, Account account) {
         RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择数据");
-        List<SoilExperiment> experimentList = soilExperimentService.list(Condition.create().setSqlSelect("group_id","group_name","sample_id","name","short_name").in("sample_id",ids).groupBy("group_id,group_name,sample_id"));
+        List<SoilExperiment> experimentList = soilExperimentService.list(Condition.create().setSqlSelect("group_id","group_name","sample_id").in("sample_id",ids).groupBy("group_id,group_name,sample_id"));
          if (CollectionUtils.isEmpty(experimentList)){
              return Lists.newArrayList();
          }
         List<Long> sampleIds = Arrays.asList(ids);
 
-         List<SoilExperiment> experimentListDb = soilExperimentService.list(Condition.create().setSqlSelect("group_id","group_name","sample_id","name").in("sample_id",ids));
+         List<SoilExperiment> experimentListDb = soilExperimentService.list(Condition.create().setSqlSelect("group_id","group_name","sample_id","name","short_name").in("sample_id",ids));
 
          for (SoilExperiment experiment:experimentList) {
            if (!sampleIds.contains(experiment.getSampleId())){
@@ -677,8 +677,8 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
                  soilExperimentList.add(experiment);
                  groupSampleMap.put(experiment.getSampleId(),soilExperimentList);
              }
-
-
+         }
+         for (SoilExperiment experiment : experimentListDb) {
              if (groupAndSampleMap.containsKey(experiment.getSampleId()+"--"+experiment.getGroupId())){
                  List<SoilExperiment> soilExperimentList = groupSampleMap.get(experiment.getSampleId()+"--"+experiment.getGroupId());
                  soilExperimentList.add(experiment);
@@ -688,7 +688,6 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
                  soilExperimentList.add(experiment);
                  groupAndSampleMap.put(experiment.getSampleId()+"--"+experiment.getGroupId(),soilExperimentList);
              }
-
          }
 
          List<SoilPrepareVO> prepareList = new ArrayList<>();