Sfoglia il codice sorgente

优化试验汇总映射数据保存逻辑,解决数据回显问题

lvy 1 settimana fa
parent
commit
fa4c1f2813

+ 4 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TrialSummaryClassificationConfigurationController.java

@@ -261,12 +261,14 @@ public class TrialSummaryClassificationConfigurationController extends BladeCont
                     List<TrialSummaryReflectionSaveDTO.ReflectionBean> reflectionBeanList = dto.getReflectionBeanList();
                     Set<Long> elementIds = reflectionBeanList.stream().map(TrialSummaryReflectionSaveDTO.ReflectionBean::getElementId).collect(Collectors.toSet());
                     if (!elementIds.isEmpty()) {
+                        List<WbsFormElement> elementList = TrialTableDataInfo.getElementList();
                         List<WbsFormElement> list = wbsFormElementService.list(Wrappers.<WbsFormElement>lambdaQuery().select(WbsFormElement::getId, WbsFormElement::getEKey)
                                 .in(WbsFormElement::getId, elementIds));
                         if (list != null && !list.isEmpty()) {
-                            Map<Long, String> elementMap = list.stream().collect(Collectors.toMap(WbsFormElement::getId, WbsFormElement::getEKey));
-                            reflectionBeanList.forEach(bean -> bean.setElementKey(elementMap.get(bean.getElementId())));
+                            elementList.addAll(list);
                         }
+                        Map<Long, String> elementMap = elementList.stream().collect(Collectors.toMap(WbsFormElement::getId, WbsFormElement::getEKey));
+                        reflectionBeanList.forEach(bean -> bean.setElementKey(elementMap.get(bean.getElementId())));
                     }
                     Set<TrialSummaryReflectionSaveDTO.ReflectionBean> collect = new HashSet<>(reflectionBeanList);
                     Set<TrialSummaryReflectionSaveDTO.ReflectionBean> updateList = collect.stream().filter(bean -> ObjectUtil.isNotEmpty(bean.getId())).collect(Collectors.toSet());