常用标签维护——获取标签添加类型

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

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -21,10 +22,17 @@ public class GetQuestionInfoVO {
     /**
      * 科室id
      */
+    @NotNull(message="科室id不能为空")
     private String deptId;
 
     /**
      * 需要去掉的标签id
      */
     private List<Long> noIds;
+
+    /**
+     * 归属类型
+     */
+    @NotNull(message="归属类型不能为空")
+    private Integer type;
 }

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

@@ -81,7 +81,9 @@ public class QuestionUsualController {
 
     @ApiOperation(value = "常用标签维护——获取标签信息[by:wangyu]",
             notes = "tagName: 标签名称，非必填<br>" +
-                    "deptId: 科室id，如果是添加不用填，如果是修改页面必填<br>")
+                    "deptId: 科室id，如果是添加不用填，如果是修改页面必填<br>" +
+                    "noIds: 需要去掉的标签id，非必填<br>" +
+                    "type: 归属类型，必填")
     @PostMapping("/getQuestionInfo")
     @SysLogger("getQuestionInfo")
     public RespDTO<List<GetQuestionInfoDTO>> getQuestionInfo(@Valid @RequestBody GetQuestionInfoVO getQuestionInfoVO) {

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

@@ -97,8 +97,8 @@
         `icss_question_info` a
         WHERE
         a.is_deleted = 'N'
-        AND a.type = '1'
         AND a.sub_type = '0'
+        AND a.type = #{type}
         <if test="deptId != null and deptId != ''">
             AND a.id NOT IN (
             SELECT