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

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

@@ -20,6 +20,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ModuleInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddModuleInfoVO;
@@ -155,6 +156,9 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         if (getModuleInfoVO.getType() != null) {
             moduleInfoQueryWrapper.eq("type", getModuleInfoVO.getType());
         }
+        if(ListUtil.isNotEmpty(getModuleInfoVO.getNoIds())){
+            moduleInfoQueryWrapper.notIn("id", getModuleInfoVO.getNoIds());
+        }
         List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
         List<Long> moduleIdList = moduleInfoList.stream().map(m -> m.getId()).collect(Collectors.toList());
         //获取模板明细信息

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description:
  * @author: wangyu
@@ -14,4 +16,6 @@ import lombok.Setter;
 public class GetModuleInfoVO extends Page {
     //模板类型
     private Integer type;
+    //要去重的子模板
+    private List<Long> noIds;
 }

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

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description:
  * @author: wangyu
@@ -20,4 +22,9 @@ public class ModuleGetQuestionInfoVO {
      * 模板id
      */
     private String moduleId;
+
+    /**
+     * 要去重的id
+     */
+    private List<Long> noIds;
 }

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

@@ -138,8 +138,15 @@
             WHERE
             c.is_deleted = 'N'
             AND c.module_id = #{moduleId}
+            AND c.question_id != ''
             )
         </if>
+        <if test="noIds != null and noIds.size != 0">
+            AND a.id NOT IN
+            <foreach  collection="noIds" item="noId" open="("  separator=","  close=")">
+                #{noId}
+            </foreach>
+        </if>
         <if test="tagName != null and tagName != ''">
             AND a.tag_name like CONCAT('%', #{tagName}, '%')
         </if>