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

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

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.entity.ModuleInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -12,6 +13,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddModuleInfoVO;
+import com.diagbot.vo.ModuleGetQuestionInfoVO;
 import com.diagbot.vo.UpdateModuleInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Component;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,6 +35,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
 
     @Autowired
     ModuleDetailFacade moduleDetailFacade;
+    @Autowired
+    QuestionInfoFacade questionInfoFacade;
 
     /**
      * 根据id删除标签模板
@@ -105,4 +110,15 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         BeanUtil.copyProperties(updateModuleInfoVO,addModuleInfoVO);
         return moduleDetailFacade.saveOrUpdateInfos(addModuleInfoVO,updateModuleInfoVO.getId());
     }
+
+    /**
+     * 获取标签池信息
+     *
+     * @param moduleGetQuestionInfoVO
+     * @return
+     */
+    public List<GetQuestionInfoDTO> getQuestionInfos(ModuleGetQuestionInfoVO moduleGetQuestionInfoVO){
+        List<GetQuestionInfoDTO> getQuestionInfoDTOS = questionInfoFacade.moduleGetQuestiongInfoByName(moduleGetQuestionInfoVO);
+        return getQuestionInfoDTOS;
+    }
 }

icssman-service/src/main/java/com/diagbot/mapper/QuestionInfoMapper.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.vo.GetQuestionInfoVO;
 import com.diagbot.vo.GetQuestionUsualByDeptVO;
+import com.diagbot.vo.ModuleGetQuestionInfoVO;
 import com.diagbot.vo.QuestionPageVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -30,11 +31,20 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
     /**
      * 根据名称获取标签信息
+     *
      * @param getQuestionInfoVO
      * @return
      */
     public List<GetQuestionInfoDTO> getQuestiongInfoByName(GetQuestionInfoVO  getQuestionInfoVO);
 
+    /**
+     * 根据名称获取标签信息
+     *
+     * @param moduleGetQuestionInfoVO
+     * @return
+     */
+    public List<GetQuestionInfoDTO> moduleGetQuestiongInfoByName(ModuleGetQuestionInfoVO moduleGetQuestionInfoVO);
+
     /**
      * 根据科室id获取标签信息
      * @param getQuestionUsualByDeptVO

icssman-service/src/main/java/com/diagbot/service/QuestionInfoService.java

@@ -7,6 +7,7 @@ import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.vo.GetQuestionInfoVO;
 import com.diagbot.vo.GetQuestionUsualByDeptVO;
+import com.diagbot.vo.ModuleGetQuestionInfoVO;
 import com.diagbot.vo.QuestionPageVO;
 
 import java.util.List;
@@ -39,6 +40,14 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
      */
     public List<GetQuestionInfoDTO> getQuestiongInfoByName(GetQuestionInfoVO getQuestionInfoVO);
 
+    /**
+     * 根据名称获取标签信息
+     *
+     * @param moduleGetQuestionInfoVO
+     * @return
+     */
+    public List<GetQuestionInfoDTO> moduleGetQuestiongInfoByName(ModuleGetQuestionInfoVO moduleGetQuestionInfoVO);
+
     /**
      * 检索
      *

icssman-service/src/main/java/com/diagbot/service/impl/QuestionInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.diagbot.mapper.QuestionInfoMapper;
 import com.diagbot.service.QuestionInfoService;
 import com.diagbot.vo.GetQuestionInfoVO;
 import com.diagbot.vo.GetQuestionUsualByDeptVO;
+import com.diagbot.vo.ModuleGetQuestionInfoVO;
 import com.diagbot.vo.QuestionPageVO;
 import org.springframework.stereotype.Service;
 
@@ -36,6 +37,11 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         return baseMapper.getQuestiongInfoByName(getQuestionInfoVO);
     }
 
+    @Override
+    public List<GetQuestionInfoDTO> moduleGetQuestiongInfoByName(ModuleGetQuestionInfoVO moduleGetQuestionInfoVO) {
+        return baseMapper.moduleGetQuestiongInfoByName(moduleGetQuestionInfoVO);
+    }
+
     @Override
     public List<QuestionInfo> index(Map map) {
         return baseMapper.index(map);

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

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/25 17:26
+ */
+@Getter
+@Setter
+public class ModuleGetQuestionInfoVO {
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 模板id
+     */
+    private String moduleId;
+}

icssman-service/src/main/java/com/diagbot/web/ModuleInfoController.java

@@ -2,9 +2,11 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ModuleInfoFacade;
 import com.diagbot.vo.AddModuleInfoVO;
+import com.diagbot.vo.ModuleGetQuestionInfoVO;
 import com.diagbot.vo.UpdateModuleInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -71,4 +74,14 @@ public class ModuleInfoController {
         moduleInfoFacade.deleteByIdsFac(ids);
         return RespDTO.onSuc(true);
     }
+
+    @ApiOperation(value = "获取标签池信息[by:wangyu]",
+            notes = "tagName: 标签名<br>" +
+                    "moduleId: 模板id，添加时不用填，修改时必填<br>")
+    @PostMapping("/getQuestionInfos")
+    @SysLogger("getQuestionInfos")
+    public RespDTO<List<GetQuestionInfoDTO>> getQuestionInfos(@Valid @RequestBody ModuleGetQuestionInfoVO moduleGetQuestionInfoVO) {
+        List<GetQuestionInfoDTO> date = moduleInfoFacade.getQuestionInfos(moduleGetQuestionInfoVO);
+        return RespDTO.onSuc(date);
+    }
 }

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

@@ -98,6 +98,28 @@
     </select>
 
 
+    <select id="moduleGetQuestiongInfoByName" resultType="com.diagbot.dto.GetQuestionInfoDTO">
+        SELECT
+        a.*
+        FROM
+        `icss_question_info` a
+        WHERE
+        a.is_deleted = 'N'
+        <if test="moduleId != null and moduleId != ''">
+            AND a.id NOT IN (
+            SELECT
+            c.question_id
+            FROM
+            `icss_module_detail` c
+            WHERE
+            c.is_deleted = 'N'
+            AND c.module_id = #{moduleId}
+            )
+        </if>
+        <if test="tagName != null and tagName != ''">
+            AND a.tag_name like CONCAT('%', #{tagName}, '%')
+        </if>
+    </select>
 
     <select id="getList" resultType="com.diagbot.dto.QuestionPageDTO">
         SELECT a.* FROM `icss_question_info` a WHERE a.is_deleted = 'N'