|
@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Collections;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -69,6 +70,7 @@ public class KlScaleFacade {
|
|
|
KlScaleDetailMenuVO detailMenuVO = new KlScaleDetailMenuVO();
|
|
|
detailMenuVO.setConceptId(conceptId);
|
|
|
List<KlScaleDetailWrapper> vteFormDetailData = klConceptScaleFacade.getKlScaleDetailData(detailMenuVO);
|
|
|
+ Map<Long, Map<Integer, List<KlScaleDetailWrapper>>> collect = vteFormDetailData.stream().filter(i -> !i.getParentId().equals(-1)).collect(Collectors.groupingBy(KlScaleDetailWrapper::getConceptId, Collectors.groupingBy(KlScaleDetailWrapper::getGroupNum)));
|
|
|
//把子级数据,放在父级下
|
|
|
Map<Long, List<KlScaleDetailWrapper>> mapParentId = vteFormDetailData.stream().collect(Collectors.groupingBy(KlScaleDetailWrapper::getConceptId));
|
|
|
for (Long key : mapParentId.keySet()) {
|
|
@@ -112,6 +114,8 @@ public class KlScaleFacade {
|
|
|
}
|
|
|
//保存问题明细
|
|
|
if (res) {
|
|
|
+ //组别默认从1开始
|
|
|
+ int baseGroup = 0;
|
|
|
List<KlScaleSaveUpParentVO> klScaleParent = klScaleSaveUpVO.getKlScaleParent();//标题
|
|
|
if (ListUtil.isNotEmpty(klScaleParent)) {
|
|
|
for (KlScaleSaveUpParentVO data : klScaleParent) {
|
|
@@ -123,8 +127,6 @@ public class KlScaleFacade {
|
|
|
klConceptScale.setConceptId(klScaleSaveUpVO.getConceptId());
|
|
|
res = klConceptScaleFacade.save(klConceptScale);
|
|
|
List<KlScaleSaveGroupVO> klScaleSaveGroup = data.getKlScaleSaveGroup();
|
|
|
- //组别默认从1开始
|
|
|
- int baseGroup = 0;
|
|
|
for (KlScaleSaveGroupVO groupData : klScaleSaveGroup) {//组别
|
|
|
baseGroup = baseGroup + 1;
|
|
|
List<KlScaleSaveUpDetailVO> klScaleSub = groupData.getKlScaleSub();
|