获取modeName

src/main/java/com/diagbot/dto/GetModuleInfoOneDTO.java

@@ -22,6 +22,8 @@ public class GetModuleInfoOneDTO {
     private Long hospitalId;
     //数据模块ID
     private Long modeId;
+    //数据模块名称
+    private String modeName;
     //模板明细
     private Map<Integer, List<QcModuleDetailDTO>> moduleDetail;
     //备注

src/main/java/com/diagbot/facade/QcModuleInfoFacade.java

@@ -5,7 +5,6 @@ import com.diagbot.dto.GetModuleInfoOneDTO;
 import com.diagbot.dto.QcModuleDetailDTO;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.QcModuleDetail;
-import com.diagbot.entity.QcModuleInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -40,22 +39,18 @@ public class QcModuleInfoFacade extends QcModuleInfoServiceImpl {
      * @param getModuleInfoOneVO
      * @return
      */
-    public GetModuleInfoOneDTO getById(GetModuleInfoOneVO getModuleInfoOneVO) {
-        GetModuleInfoOneDTO getModuleInfoOneDTO = new GetModuleInfoOneDTO();
+    public GetModuleInfoOneDTO getByIdFac(GetModuleInfoOneVO getModuleInfoOneVO) {
         //获取模板信息
-        QueryWrapper<QcModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
-        moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", getModuleInfoOneVO.getModuleId());
-        QcModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper, false);
-        if (null == moduleInfo) {
+        GetModuleInfoOneDTO getModuleInfoOneDTO = this.getById(getModuleInfoOneVO);
+
+        if (null == getModuleInfoOneDTO) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "模板已删除【" + getModuleInfoOneVO.getModuleId() + "】");
         }
-        BeanUtil.copyProperties(moduleInfo, getModuleInfoOneDTO);
         List<QcModuleDetail> qcModuleDetailList = qcModuleDetailFacade.list(new QueryWrapper<QcModuleDetail>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("module_id", getModuleInfoOneDTO.getId())
-                .orderByDesc("order_no")
+                .orderByAsc("order_no")
         );
         List<QcModuleDetailDTO> qcModuleDetailDTOList = BeanUtil.listCopyTo(qcModuleDetailList, QcModuleDetailDTO.class);
 

src/main/java/com/diagbot/mapper/QcModuleInfoMapper.java

@@ -1,6 +1,9 @@
 package com.diagbot.mapper;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.GetModuleInfoOneDTO;
 import com.diagbot.entity.QcModuleInfo;
+import com.diagbot.vo.GetModuleInfoOneVO;
 
 /**
  * <p>
@@ -12,4 +15,5 @@ import com.diagbot.entity.QcModuleInfo;
  */
 public interface QcModuleInfoMapper extends BaseMapper<QcModuleInfo> {
 
+    public GetModuleInfoOneDTO getById(GetModuleInfoOneVO getModuleInfoOneVO);
 }

src/main/java/com/diagbot/service/QcModuleInfoService.java

@@ -1,7 +1,9 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.GetModuleInfoOneDTO;
 import com.diagbot.entity.QcModuleInfo;
+import com.diagbot.vo.GetModuleInfoOneVO;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.diagbot.entity.QcModuleInfo;
  */
 public interface QcModuleInfoService extends IService<QcModuleInfo> {
 
+    public GetModuleInfoOneDTO getById(GetModuleInfoOneVO getModuleInfoOneVO);
 }

src/main/java/com/diagbot/service/impl/QcModuleInfoServiceImpl.java

@@ -1,9 +1,11 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.GetModuleInfoOneDTO;
 import com.diagbot.entity.QcModuleInfo;
 import com.diagbot.mapper.QcModuleInfoMapper;
 import com.diagbot.service.QcModuleInfoService;
+import com.diagbot.vo.GetModuleInfoOneVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class QcModuleInfoServiceImpl extends ServiceImpl<QcModuleInfoMapper, QcModuleInfo> implements QcModuleInfoService {
 
+    @Override
+    public GetModuleInfoOneDTO getById(GetModuleInfoOneVO getModuleInfoOneVO) {
+        return baseMapper.getById(getModuleInfoOneVO);
+    }
 }

src/main/java/com/diagbot/web/QcModuleInfoController.java

@@ -35,7 +35,7 @@ public class QcModuleInfoController {
     @PostMapping("/getById")
     @SysLogger("getById")
     public RespDTO<GetModuleInfoOneDTO> getById(@RequestBody GetModuleInfoOneVO getModuleInfoVO) {
-        GetModuleInfoOneDTO date = qcModuleInfoFacade.getById(getModuleInfoVO);
+        GetModuleInfoOneDTO date = qcModuleInfoFacade.getByIdFac(getModuleInfoVO);
         return RespDTO.onSuc(date);
     }
 }

src/main/resources/mapper/QcModuleInfoMapper.xml

@@ -16,4 +16,10 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <select id="getById" resultType="com.diagbot.dto.GetModuleInfoOneDTO">
+        select t1.*, t2.name mode_name from qc_module_info t1
+        left join qc_mode t2 on t1.mode_id = t2.id and t2.is_deleted = 'N'
+        where t1.is_deleted = 'N'
+        and t1.id = #{moduleId}
+    </select>
 </mapper>