常用标签维护——修改时根据科室获取常见标签

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

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.QuestionIndexDTO;
 import com.diagbot.dto.QuestionPageDTO;
@@ -21,6 +20,7 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.GetQuestionInfoVO;
+import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionPageVO;
 import com.diagbot.vo.QuestionSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -203,6 +203,11 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
         return this.getOne(queryWrapper);
     }
 
+    /**
+     * 根据标签名获取标签信息
+     * @param getQuestionInfoVO
+     * @return
+     */
     public List<GetQuestionInfoDTO> getQuestiongInfosByName(GetQuestionInfoVO getQuestionInfoVO){
         List<GetQuestionInfoDTO> getQuestionInfoDTOS = this.getQuestiongInfosByName(getQuestionInfoVO);
         if(ListUtil.isEmpty(getQuestionInfoDTOS)){
@@ -211,4 +216,18 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
         }
         return getQuestionInfoDTOS;
     }
+
+    /**
+     * 根据科室id获取常用标签信息
+     * @param getQuestionUsualByDeptVO
+     * @return
+     */
+    public List<GetQuestionInfoDTO> getQuestionUsualByDept(GetQuestionUsualByDeptVO getQuestionUsualByDeptVO){
+        List<GetQuestionInfoDTO> getQuestionInfoDTOList = this.getQuestionUsualsByDept(getQuestionUsualByDeptVO);
+        if(ListUtil.isEmpty(getQuestionInfoDTOList)){
+            throw new CommonException(CommonErrorCode.FAIL,
+                    "获取常用标签失败");
+        }
+        return getQuestionInfoDTOList;
+    }
 }

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

@@ -1,7 +1,5 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.UsualEnum;
@@ -46,7 +44,7 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         QuestionUsual questionUsual = new QuestionUsual();
         String userId = "1"/*UserUtils.getCurrentPrincipleID()*/;
         for (int i = 0; i<questionUsualVO.getQuestionId().size(); i++ ) {
-            questionUsual =new QuestionUsual();
+            questionUsual = new QuestionUsual();
             questionUsual.setCreator(userId);
             questionUsual.setModifier(userId);
             questionUsual.setGmtCreate(DateUtil.now());
@@ -71,7 +69,7 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public Boolean updateQuestionUsual(UpdateQuetionUsualVO updateQuetionUsualVO){
-        QuestionUsual questionUsual =new QuestionUsual();
+        QuestionUsual questionUsual = new QuestionUsual();
         BeanUtil.copyProperties(updateQuetionUsualVO,questionUsual);
         questionUsual.setGmtModified(DateUtil.now());
         questionUsual.setModifier(UserUtils.getCurrentPrincipleID());
@@ -89,7 +87,7 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public Boolean deleteQuestionUsual(UpdateQuetionUsualVO updateQuetionUsualVO){
-        QuestionUsual questionUsual =new QuestionUsual();
+        QuestionUsual questionUsual = new QuestionUsual();
         BeanUtil.copyProperties(updateQuetionUsualVO,questionUsual);
         questionUsual.setIsDeleted(IsDeleteEnum.Y.getKey());
         questionUsual.setGmtModified(DateUtil.now());
@@ -102,12 +100,4 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         return flag;
     }
 
-    /**
-     * 获取常用标签信息（还不确定返回内容）
-     * @return
-     */
-    public IPage<QuestionUsual> getQuestionUsual(){
-        IPage iPage =new Page();
-       return iPage;
-    }
 }

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.vo.GetQuestionInfoVO;
+import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionPageVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -34,6 +35,13 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
      */
     public List<GetQuestionInfoDTO> getQuestiongInfoByName(GetQuestionInfoVO  getQuestionInfoVO);
 
+    /**
+     * 根据科室id获取标签信息
+     * @param getQuestionUsualByDeptVO
+     * @return
+     */
+    public List<GetQuestionInfoDTO> getQuestionUsualsByDept(GetQuestionUsualByDeptVO getQuestionUsualByDeptVO);
+
 
     /**
      * 获取标签列表

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

@@ -1,12 +1,12 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.vo.GetQuestionInfoVO;
+import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionPageVO;
 
 import java.util.List;
@@ -56,6 +56,13 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
      * @return
      */
     IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO);
+
+    /**
+     * 根据科室id获取标签信息
+     * @param getQuestionUsualByDeptVO
+     * @return
+     */
+    public List<GetQuestionInfoDTO> getQuestionUsualsByDept(GetQuestionUsualByDeptVO getQuestionUsualByDeptVO);
 }
 
 

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

@@ -1,7 +1,6 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.QuestionPageDTO;
@@ -9,6 +8,7 @@ import com.diagbot.entity.QuestionInfo;
 import com.diagbot.mapper.QuestionInfoMapper;
 import com.diagbot.service.QuestionInfoService;
 import com.diagbot.vo.GetQuestionInfoVO;
+import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionPageVO;
 import org.springframework.stereotype.Service;
 
@@ -41,6 +41,11 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         return baseMapper.index(map);
     }
 
+    @Override
+    public List<GetQuestionInfoDTO> getQuestionUsualsByDept(GetQuestionUsualByDeptVO getQuestionUsualByDeptVO) {
+        return baseMapper.getQuestionUsualsByDept(getQuestionUsualByDeptVO);
+    }
+
     @Override
     public IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO) {
         return baseMapper.getList(questionPageVO);

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/13 13:18
+ */
+@Getter
+@Setter
+public class GetQuestionUsualByDeptVO {
+    @NotNull(message = "请输入科室id")
+    private Long deptId;
+}

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

@@ -1,16 +1,15 @@
 package com.diagbot.web;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.QuestionUsual;
 import com.diagbot.facade.DeptInfoFacade;
 import com.diagbot.facade.QuestionInfoFacade;
 import com.diagbot.facade.QuestionUsualFacade;
 import com.diagbot.vo.GetQuestionInfoVO;
+import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionUsualVO;
 import com.diagbot.vo.UpdateQuetionUsualVO;
 import io.swagger.annotations.Api;
@@ -80,15 +79,6 @@ public class QuestionUsualController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "常用标签维护——查询[by:wangyu]",
-            notes = "id: 常用标签id,必填<br>")
-    @PostMapping("/getQuestionUsual")
-    @SysLogger("getQuestionUsual")
-    public RespDTO<IPage<QuestionUsual>> getQuestionUsual() {
-        IPage<QuestionUsual> data = questionUsualFacade.getQuestionUsual();
-        return RespDTO.onSuc(data);
-    }
-
     @ApiOperation(value = "常用标签维护——获取科室名称[by:wangyu]",
             notes = "")
     @PostMapping("/getDeptName")
@@ -107,4 +97,13 @@ public class QuestionUsualController {
         List<GetQuestionInfoDTO> data = questionInfoFacade.getQuestiongInfosByName(getQuestionInfoVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "常用标签维护——根据科室获取常用标签信息(修改用)[by:wangyu]",
+            notes = "deptId: 科室id,必填<br>")
+    @PostMapping("/getQuestionUsualByDept")
+    @SysLogger("getQuestionUsualByDept")
+    public RespDTO<List<GetQuestionInfoDTO>> getQuestionUsualByDept(@Valid @RequestBody GetQuestionUsualByDeptVO getQuestionUsualByDeptVO) {
+        List<GetQuestionInfoDTO> data = questionInfoFacade.getQuestionUsualByDept(getQuestionUsualByDeptVO);
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -118,4 +118,11 @@
 
     </select>
 
+    <select id="getQuestionUsualsByDept" resultType="com.diagbot.dto.GetQuestionInfoDTO">
+        SELECT a.* FROM `icss_question_info` a
+        LEFT JOIN icss_question_usual b ON a.id = b.question_id
+        WHERE b.dept_id = #{deptId}
+        GROUP BY a.id
+    </select>
+
 </mapper>