模板相关接口

mrman-service/src/main/java/com/diagbot/dto/GetModuleInfoOneDTO.java

@@ -23,7 +23,7 @@ public class GetModuleInfoOneDTO {
     //数据模块ID
     private Long modeId;
     //模板明细
-    private Map<Integer, List<QuestionDTO>> moduleDetail;
+    private Map<Integer, List<QcModuleDetailDTO>> moduleDetail;
     //备注
     private String remark;
 }

mrman-service/src/main/java/com/diagbot/dto/QcModuleDetailDTO.java

@@ -0,0 +1,32 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 模型明细表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-27
+ */
+@Data
+public class QcModuleDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分组Id
+     */
+    private Integer groupId;
+
+    /**
+     * questionId
+     */
+    private Long questionId;
+
+    private QuestionDTO questionDTO;
+
+}

mrman-service/src/main/java/com/diagbot/facade/QcModuleInfoFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.GetModuleInfoOneDTO;
 import com.diagbot.dto.ModuleInfoListDTO;
+import com.diagbot.dto.QcModuleDetailDTO;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.QcModuleDetail;
 import com.diagbot.entity.QcModuleInfo;
@@ -15,6 +16,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.QcModuleInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddModuleInfoVO;
 import com.diagbot.vo.GetModuleInfoOneVO;
@@ -23,7 +25,6 @@ import com.diagbot.vo.QuestionIdsVO;
 import com.diagbot.vo.UpdateModuleInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -62,10 +63,8 @@ public class QcModuleInfoFacade extends QcModuleInfoServiceImpl {
         paramMap.put("ids", Arrays.asList(ids.split(",")));
         paramMap.put("gmtModified", date);
         paramMap.put("modifier", userId);
-
         //删除模板
         this.deleteByIds(paramMap);
-
         //删除明细表
         qcModuleDetailFacade.deleteByModuleIdFac(paramMap);
         return true;
@@ -135,12 +134,12 @@ public class QcModuleInfoFacade extends QcModuleInfoServiceImpl {
     }
 
     /**
-     * 模板维护页面获取模板列表
+     * 根据id获取模板信息
      *
      * @param getModuleInfoOneVO
      * @return
      */
-    public GetModuleInfoOneDTO getModuleInfoOne(GetModuleInfoOneVO getModuleInfoOneVO) {
+    public GetModuleInfoOneDTO getById(GetModuleInfoOneVO getModuleInfoOneVO) {
         GetModuleInfoOneDTO getModuleInfoOneDTO = new GetModuleInfoOneDTO();
         //获取模板信息
         QueryWrapper<QcModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
@@ -157,14 +156,21 @@ public class QcModuleInfoFacade extends QcModuleInfoServiceImpl {
                 .eq("module_id", getModuleInfoOneDTO.getId())
                 .orderByDesc("order_no")
         );
+        List<QcModuleDetailDTO> qcModuleDetailDTOList = BeanUtil.listCopyTo(qcModuleDetailList, QcModuleDetailDTO.class);
+
+        // 根据questionId获取所有的标签
         List<String> questionIds = qcModuleDetailList.stream().map(r -> r.getQuestionId().toString()).collect(Collectors.toList());
         QuestionIdsVO questionIdsVO = new QuestionIdsVO();
         questionIdsVO.setIds(String.join(",", questionIds));
         Map<Long, QuestionDTO> questionDTOMap = qcQuestionFacade.getByIds(questionIdsVO);
-
-
-//        Map<Integer, List<QcModuleDetail>> map = EntityUtil.makeEntityListMap(qcModuleDetailList, "groupId");
-//        getModuleInfoOneDTO.setModuleDetail(map);
+        for (QcModuleDetailDTO bean : qcModuleDetailDTOList) {
+            QuestionDTO questionDTO = questionDTOMap.get(bean.getQuestionId());
+            if (questionDTO != null) {
+                bean.setQuestionDTO(questionDTO);
+            }
+        }
+        Map<Integer, List<QcModuleDetailDTO>> map = EntityUtil.makeEntityListMap(qcModuleDetailDTOList, "groupId");
+        getModuleInfoOneDTO.setModuleDetail(map);
         return getModuleInfoOneDTO;
     }
 

mrman-service/src/main/java/com/diagbot/web/QcModuleInfoController.java

@@ -10,13 +10,14 @@ import com.diagbot.vo.AddModuleInfoVO;
 import com.diagbot.vo.DeleteModuleVO;
 import com.diagbot.vo.GetModuleInfoOneVO;
 import com.diagbot.vo.GetModuleInfoVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 
@@ -28,8 +29,10 @@ import javax.validation.Valid;
  * @author zhoutg
  * @since 2020-04-27
  */
-@Controller
+@RestController
 @RequestMapping("/qc/qcModuleInfo")
+@SuppressWarnings("unchecked")
+@Api(value = "模板相关API", tags = { "模板相关API" })
 public class QcModuleInfoController {
 
     @Autowired
@@ -60,7 +63,7 @@ public class QcModuleInfoController {
         return RespDTO.onSuc(true);
     }
 
-    @ApiOperation(value = "模板分页列表（主页面查询）[by:zhoutg]",
+    @ApiOperation(value = "模板分页列表[by:zhoutg]",
             notes = "name: 模板名称<br>" +
                     "modeId: 数据模块ID<br>" +
                     "hospitalId: 医院ID<br>")
@@ -71,12 +74,12 @@ public class QcModuleInfoController {
         return RespDTO.onSuc(date);
     }
 
-    @ApiOperation(value = "获取单个模板信息(修改用)[by:zhoutg]",
+    @ApiOperation(value = "根据id获取模板信息[by:zhoutg]",
             notes = "moduleId: 模板id<br>")
     @PostMapping("/getById")
     @SysLogger("getById")
-    public RespDTO<GetModuleInfoOneDTO> getModuleInfoOne(@RequestBody GetModuleInfoOneVO getModuleInfoVO) {
-        GetModuleInfoOneDTO date = qcModuleInfoFacade.getModuleInfoOne(getModuleInfoVO);
+    public RespDTO<GetModuleInfoOneDTO> getById(@RequestBody GetModuleInfoOneVO getModuleInfoVO) {
+        GetModuleInfoOneDTO date = qcModuleInfoFacade.getById(getModuleInfoVO);
         return RespDTO.onSuc(date);
     }
 }

mrman-service/src/main/java/com/diagbot/web/QcQuestionInfoController.java

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -59,7 +58,7 @@ public class QcQuestionInfoController {
             notes = "")
     @PostMapping("/page")
     @SysLogger("page")
-    public RespDTO<IPage<QuestionPageDTO>> list(@RequestBody @Valid QuestionPageVO questionPageVO) {
+    public RespDTO<IPage<QuestionPageDTO>> list(@RequestBody QuestionPageVO questionPageVO) {
         IPage<QuestionPageDTO> data = qcQuestionFacade.getListFac(questionPageVO);
         return RespDTO.onSuc(data);
     }