Merge remote-tracking branch 'origin/debug' into debug

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

@@ -490,6 +490,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("tagType", questionIndexVO.getTagType());
         paramMap.put("existName", questionIndexVO.getExistName());
         paramMap.put("notTagType", questionIndexVO.getNotTagType());
+        paramMap.put("notControlType", questionIndexVO.getNotControlType());
         return this.index(paramMap);
     }
     
@@ -510,6 +511,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("tagType", questionIndexVO.getTagType());
         paramMap.put("existName", questionIndexVO.getExistName());
         paramMap.put("notTagType", questionIndexVO.getNotTagType());
+        paramMap.put("notControlType", questionIndexVO.getNotControlType());
         List<QuestionInfo> list = this.index(paramMap);
         if(ListUtil.isEmpty(list)){
         	return list;

icssman-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -375,6 +375,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
                 for (Long key : detailMap.keySet()) {
                     AddTagRetrievalVO addTagRetrievalVO = new AddTagRetrievalVO();
                     addTagRetrievalVO.setQuestionId(key);
+                    addTagRetrievalVO.setQuestionName(detailMap.get(key).get(0).getQuestionName());
                     addTagRetrievalVO.setItemList(detailMap.get(key));
                     addTagRetrievalVOList.add(addTagRetrievalVO);
                 }

icssman-service/src/main/java/com/diagbot/vo/QuestionIndexVO.java

@@ -22,4 +22,5 @@ public class QuestionIndexVO {
     private List<Long> notIds;
     private String existName; //是否重复
     private List<Integer> notTagType;
+    private List<Integer> notControlType;
 }

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -82,6 +82,12 @@
                 #{notTagType}
             </foreach>
         </if>
+        <if test="notControlType != null and notControlType.size() > 0">
+            and control_type not in
+            <foreach  collection="notControlType" item="notControlType" open="("  separator=","  close=")">
+                #{notControlType}
+            </foreach>
+        </if>
         <if test="notIds != null and notIds.size() > 0 ">
             and id not in
             <foreach  collection="notIds" item="id" open="("  separator=","  close=")">