|
|
@@ -32,6 +32,7 @@ import com.diagbot.entity.QuestionInfo;
|
|
|
import com.diagbot.entity.Retrieval;
|
|
|
import com.diagbot.entity.RetrievalMapping;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
+import com.diagbot.enums.TagTypeEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.service.RetrievalMappingService;
|
|
|
@@ -350,6 +351,23 @@ public class RetrievalFacade extends RetrievalServiceImpl {
|
|
|
List<QuestionInfo> questionInfos = questionFacade.list(questionInfoQe);
|
|
|
Map<String, Long> questionIdMap = questionInfos.stream().collect(Collectors.toMap(QuestionInfo::getTagName, i -> i.getId()));
|
|
|
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){
|
|
|
+ sbf.append("(");
|
|
|
+ int index = 0;
|
|
|
+ for(QuestionInfo p:questionInfos_){
|
|
|
+ sbf.append(p.getTagName()).append("-").append(TagTypeEnum.getName(p.getTagType()));
|
|
|
+ if(index<questionNames.size()-1){
|
|
|
+ sbf.append("、");
|
|
|
+ }
|
|
|
+ index++;
|
|
|
+ }
|
|
|
+ sbf.append(")");
|
|
|
+ sbf.append("标签不支持导入！");
|
|
|
+ throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
detailList.forEach(i -> {
|
|
|
i.setQuestionId(questionIdMap.get(i.getQuestionName()));
|
|
|
});
|
rgb