浏览代码

标签删除时关联提示

wangyu 5 年之前
父节点
当前提交
a076b0f69b

+ 4 - 5
icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -24,7 +24,6 @@ import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModuleInfoTypeEnum;
 import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.enums.TagTypeEnum;
 import com.diagbot.service.impl.ModuleInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
@@ -588,10 +587,10 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                     .in("id", moduleIds))
                     .stream().map(row ->  row.getName()).collect(Collectors.toList());
             for (String mouduleName: moduleNames) {
-                errMsg.append("该标签已关联").append("【" + mouduleName + "】").append("<br/>");
+                errMsg.append("请先删除关联模板:").append("【" + mouduleName + "】").append("<br/>");
             }
         }
-        StringBuffer titalMsg = new StringBuffer();
+        /*StringBuffer titalMsg = new StringBuffer();
         StringBuffer questionMsg = new StringBuffer();
         List<QuestionInfo> info = questionFacade.getParentQuestion(getQuestiongAndModuleRelationsVO.getQuestionId());
         for (QuestionInfo bean : info) {
@@ -603,9 +602,9 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 questionMsg.append("【"+bean.getTagName()+"】");
             }
         }
-        titalMsg.append("该标签已关联父级:").append(questionMsg).append("<br/>").append(errMsg);
+        titalMsg.append("该标签已关联父级:").append(questionMsg).append("<br/>").append(errMsg);*/
         GetQuestiongAndModuleRelationsDTO getQuestiongAndModuleRelationsDTO = new GetQuestiongAndModuleRelationsDTO();
-        getQuestiongAndModuleRelationsDTO.setRelationInfos(titalMsg.append("是否删除?"));
+        getQuestiongAndModuleRelationsDTO.setRelationInfos(errMsg);
         return getQuestiongAndModuleRelationsDTO;
     }
 

+ 10 - 1
icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.client.KnowledgemanServiceClient;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.GetQuestionInfoDTO;
+import com.diagbot.dto.GetQuestiongAndModuleRelationsDTO;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.dto.RespDTO;
@@ -39,6 +40,7 @@ import com.diagbot.vo.ConceptExistVO;
 import com.diagbot.vo.DeleteQuestionVO;
 import com.diagbot.vo.GetQuestionIdsByTypeVO;
 import com.diagbot.vo.GetQuestionInfoVO;
+import com.diagbot.vo.GetQuestiongAndModuleRelationsVO;
 import com.diagbot.vo.IndexIcssVO;
 import com.diagbot.vo.IndexLexiconVO;
 import com.diagbot.vo.QuestionIdsVO;
@@ -515,7 +517,14 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         sb.toString());
             }
-
+            //模板关联
+            GetQuestiongAndModuleRelationsVO getQuestiongAndModuleRelationsVO = new GetQuestiongAndModuleRelationsVO();
+            getQuestiongAndModuleRelationsVO.setQuestionId(Long.parseLong(id));
+            GetQuestiongAndModuleRelationsDTO getQuestiongAndModuleRelationsDTO = moduleInfoFacade.getQuestiongAndModuleRelations(getQuestiongAndModuleRelationsVO);
+            if(null != getQuestiongAndModuleRelationsDTO){
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        getQuestiongAndModuleRelationsDTO.getRelationInfos().toString());
+            }
             //删除自身
             this.deleteByIds(paramMap);
             //删除明细