二期诊断关联量表维护，分页查询

icssman-service/src/main/java/com/diagbot/dto/GetDisScaleAllInfoDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.DisScale;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/4/1 16:12
+ */
+@Getter
+@Setter
+public class GetDisScaleAllInfoDTO extends DisScale {
+    //诊断名称
+    private String disName;
+    //量表名称
+    private String scaleName;
+
+}

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

@@ -2,6 +2,8 @@ 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.diagbot.dto.GetDisScaleAllInfoDTO;
 import com.diagbot.entity.DisScale;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
@@ -12,6 +14,7 @@ import com.diagbot.service.impl.DisScaleServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddDisScaleInfoVO;
+import com.diagbot.vo.GetDisScaleAllInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -77,4 +80,15 @@ public class DisScaleFacade extends DisScaleServiceImpl{
         disScaleService.saveBatch(addList);
         return true;
     }
+
+    /**
+     * 分页获取诊断关联量表信息
+     *
+     * @param getDisScaleAllInfoVO
+     * @return
+     */
+    public IPage<GetDisScaleAllInfoDTO> getDisScaleAllInfo(GetDisScaleAllInfoVO getDisScaleAllInfoVO){
+        IPage<GetDisScaleAllInfoDTO> data = this.getDisScaleInfo(getDisScaleAllInfoVO);
+        return data;
+    }
 }

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

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.DisScale;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.GetDisScaleAllInfoDTO;
+import com.diagbot.entity.DisScale;
+import com.diagbot.vo.GetDisScaleAllInfoVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +17,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DisScaleMapper extends BaseMapper<DisScale> {
 
+    /**
+     * 分页获取诊断关联量表信息
+     *
+     * @param getDisScaleAllInfoVO
+     * @return
+     */
+    public IPage<GetDisScaleAllInfoDTO> getDisScaleInfo(@Param("getDisScaleAllInfoVO") GetDisScaleAllInfoVO getDisScaleAllInfoVO);
 }

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

@@ -1,7 +1,10 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.DisScale;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.GetDisScaleAllInfoDTO;
+import com.diagbot.entity.DisScale;
+import com.diagbot.vo.GetDisScaleAllInfoVO;
 
 /**
  * <p>
@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface DisScaleService extends IService<DisScale> {
 
+    /**
+     * 分页获取诊断关联量表信息
+     *
+     * @param getDisScaleAllInfoVO
+     * @return
+     */
+    public IPage<GetDisScaleAllInfoDTO> getDisScaleInfo(GetDisScaleAllInfoVO getDisScaleAllInfoVO);
 }

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

@@ -1,9 +1,12 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.GetDisScaleAllInfoDTO;
 import com.diagbot.entity.DisScale;
 import com.diagbot.mapper.DisScaleMapper;
 import com.diagbot.service.DisScaleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.GetDisScaleAllInfoVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class DisScaleServiceImpl extends ServiceImpl<DisScaleMapper, DisScale> implements DisScaleService {
 
+    @Override
+    public IPage<GetDisScaleAllInfoDTO> getDisScaleInfo(GetDisScaleAllInfoVO getDisScaleAllInfoVO) {
+        return baseMapper.getDisScaleInfo(getDisScaleAllInfoVO);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/4/1 16:14
+ */
+@Getter
+@Setter
+public class GetDisScaleAllInfoVO extends Page {
+    //诊断名称
+    private String disName;
+    //量表名称
+    private String scaleName;
+
+}

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

@@ -1,10 +1,13 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetDisScaleAllInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DisScaleFacade;
 import com.diagbot.vo.AddDisScaleInfoVO;
+import com.diagbot.vo.GetDisScaleAllInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,4 +45,14 @@ public class DisScaleController {
         Boolean data = disScaleFacade.addDisScaleInfo(addDisScaleInfoVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "【二期】诊断量表关联——分页获取关联信息[by:wangyu]",
+            notes = "disName: 诊断名称<br>" +
+                    "scaleName: 量表名称<br>")
+    @PostMapping("/getDisScaleAllInfo")
+    @SysLogger("getDisScaleAllInfo")
+    public RespDTO<IPage<GetDisScaleAllInfoDTO>> getDisScaleAllInfo(@RequestBody GetDisScaleAllInfoVO getDisScaleAllInfoVO) {
+        IPage<GetDisScaleAllInfoDTO> data = disScaleFacade.getDisScaleAllInfo(getDisScaleAllInfoVO);
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -16,4 +16,20 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <select id="getDisScaleInfo" resultType="com.diagbot.dto.GetDisScaleAllInfoDTO">
+        SELECT
+	      a.*,b.`name` AS dis_name,c.`name` AS scale_name
+        FROM
+	      `icss_dis_scale` a
+        LEFT JOIN icss_question_info b ON a.dis_id = b.id
+        LEFT JOIN icss_question_info c ON a.scale_id = c.id
+        WHERE a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
+        <if test="getDisScaleAllInfoVO.disName != null and getDisScaleAllInfoVO.disName != ''">
+            and b.`name` LIKE CONCAT('%',#{getDisScaleAllInfoVO.disName},'%')
+        </if>
+        <if test="getDisScaleAllInfoVO.scaleName != null and getDisScaleAllInfoVO.scaleName != ''">
+            and c.`name` LIKE CONCAT('%',#{getDisScaleAllInfoVO.scaleName},'%')
+        </if>
+    </select>
+
 </mapper>