|
@@ -268,7 +268,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
|
|
|
List<ModuleMappingDTO> moduleMappingDTOS = new ArrayList<>();
|
|
|
List<Long> modIds = new ArrayList<>();
|
|
|
ModuleMappingDTO moduleMappingDTO = new ModuleMappingDTO();
|
|
|
- List modeList = new ArrayList();
|
|
|
+ List<String> modeList = new ArrayList();
|
|
|
for (QcAllInputcasesDTO qcAllInputcasesDTO : res) {
|
|
|
moduleMappingDTOS = new ArrayList<>();
|
|
|
for (Mode mode : modes) {
|
|
@@ -276,9 +276,13 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
|
|
|
moduleMappingDTO.setModeId(mode.getId());
|
|
|
moduleMappingDTO.setName(mode.getName());
|
|
|
if(modelMap.get(mode.getId()) != null){
|
|
|
- modeList = new ArrayList();
|
|
|
- modeList = modelMap.get(mode.getId()).stream().map(ModelMapping::getText).collect(Collectors.toList());
|
|
|
- moduleMappingDTO.setText(modeList);
|
|
|
+ for (ModelMapping modelMapping: modelMap.get(mode.getId())) {
|
|
|
+ if (modelMapping.getCaseNumberId().intValue() == qcAllInputcasesDTO.getId()){
|
|
|
+ modeList = new ArrayList();
|
|
|
+ modeList.add(modelMapping.getText());
|
|
|
+ moduleMappingDTO.setText(modeList);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
moduleMappingDTOS.add(moduleMappingDTO);
|
|
|
}
|