|
@@ -38,6 +38,7 @@ import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.service.RetrievalMappingService;
|
|
|
import com.diagbot.service.RetrievalService;
|
|
|
import com.diagbot.service.impl.RetrievalServiceImpl;
|
|
|
+import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.DateUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
@@ -268,6 +269,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
|
|
|
public RetrievalExcelImDTO retrievalExcelIm(MultipartFile file) {
|
|
|
List<AddTagRetrievalVO> addTagRetrievalVOList = new ArrayList<>();
|
|
|
List<AddTagRetrievalDetailVO> detailList = new ArrayList<>();
|
|
|
+ List<AddTagRetrievalDetailVO> detailList_ = new ArrayList<>();
|
|
|
StringBuffer sbf = new StringBuffer();
|
|
|
InputStream inputStream = null;
|
|
|
Workbook wb = null;
|
|
@@ -351,7 +353,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
|
|
|
List<QuestionInfo> questionInfos = questionFacade.list(questionInfoQe);
|
|
|
|
|
|
|
|
|
- Map<String,Long> quesCouMap = questionInfos.stream().collect(Collectors.groupingBy(QuestionInfo::getTagName, Collectors.counting()));
|
|
|
+ /* Map<String,Long> quesCouMap = questionInfos.stream().collect(Collectors.groupingBy(QuestionInfo::getTagName, Collectors.counting()));
|
|
|
for(String key:quesCouMap.keySet()){
|
|
|
if(quesCouMap.get(key)>1){
|
|
|
sbf.append(key).append(" ");
|
|
@@ -360,9 +362,9 @@ public class RetrievalFacade extends RetrievalServiceImpl {
|
|
|
if(sbf.length()>0){
|
|
|
sbf.append("数据不规范");
|
|
|
throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
- Map<String, Long> questionIdMap = questionInfos.stream().collect(Collectors.toMap(QuestionInfo::getTagName, i -> i.getId()));
|
|
|
+ Map<String, List<QuestionInfo>> questionInfoListMap = questionInfos.stream().collect(Collectors.groupingBy(QuestionInfo::getTagName));
|
|
|
if(questionNames.size()==questionInfos.size()){
|
|
|
List<QuestionInfo> questionInfos_ = questionInfos.stream().filter(p->p.getTagType()==TagTypeEnum.T8.getKey()||p.getTagType()==TagTypeEnum.T10.getKey()||p.getTagType()==TagTypeEnum.T11.getKey()).collect(Collectors.toList());
|
|
|
if(questionInfos_.size()>0){
|
|
@@ -382,9 +384,17 @@ public class RetrievalFacade extends RetrievalServiceImpl {
|
|
|
|
|
|
|
|
|
detailList.forEach(i -> {
|
|
|
- i.setQuestionId(questionIdMap.get(i.getQuestionName()));
|
|
|
+ questionInfoListMap.get(i.getQuestionName()).forEach(j->{
|
|
|
+ AddTagRetrievalDetailVO addTagRetrievalDetailVO = new AddTagRetrievalDetailVO();
|
|
|
+ BeanUtil.copyProperties(i, addTagRetrievalDetailVO);
|
|
|
+ addTagRetrievalDetailVO.setQuestionId(j.getId());
|
|
|
+ detailList_.add(addTagRetrievalDetailVO);
|
|
|
+ });
|
|
|
});
|
|
|
- Map<Long, List<AddTagRetrievalDetailVO>> detailMap = detailList.stream().collect(Collectors.groupingBy(AddTagRetrievalDetailVO::getQuestionId));
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ Map<Long, List<AddTagRetrievalDetailVO>> detailMap = detailList_.stream().collect(Collectors.groupingBy(AddTagRetrievalDetailVO::getQuestionId));
|
|
|
for (Long key : detailMap.keySet()) {
|
|
|
AddTagRetrievalVO addTagRetrievalVO = new AddTagRetrievalVO();
|
|
|
addTagRetrievalVO.setQuestionId(key);
|
|
@@ -393,7 +403,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
|
|
|
addTagRetrievalVOList.add(addTagRetrievalVO);
|
|
|
}
|
|
|
}else{
|
|
|
- List<String> questionNames_ = questionNames.stream().filter(t->questionIdMap.get(t)==null).collect(Collectors.toList());
|
|
|
+ List<String> questionNames_ = questionNames.stream().filter(t->questionInfoListMap.get(t)==null).collect(Collectors.toList());
|
|
|
sbf.append("标签数据不存在(");
|
|
|
int index = 0;
|
|
|
|