bug修改

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
 import lombok.Getter;
 import lombok.Setter;
@@ -20,5 +21,6 @@ public class IntroducePageDTO extends IntroduceInfo {
     private Date gmtOperate;
     private String tagName;
     private List<QuestionShortDTO> questionList;
-    private List<QuestionShortDTO> unRelatedQuestionList;
+    //private List<QuestionShortDTO> unRelatedQuestionList;
+    private List<IntroduceDetail> details;
 }

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

@@ -294,7 +294,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         introducePageDTO.setQuestionList(questionShortDTOList);
 
         //未关联的标签
-        QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
+        /*QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
         unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("sub_type", 0)
                 .notIn("id", questionIds);
@@ -302,7 +302,13 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
 
         List<QuestionShortDTO> unRelatedQuestionDTOList
                 = BeanUtil.listCopyTo(unRelatedQuestionList, QuestionShortDTO.class);
-        introducePageDTO.setUnRelatedQuestionList(unRelatedQuestionDTOList);
+        introducePageDTO.setUnRelatedQuestionList(unRelatedQuestionDTOList);*/
+
+        //提示信息明细
+        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper=new QueryWrapper<>();
+        introduceDetailQueryWrapper.eq("is_deleted",IsDeleteEnum.N).eq("introduce_id",id).orderByAsc("order_no");
+        List<IntroduceDetail> introduceDetailList=introduceDetailFacade.list(introduceDetailQueryWrapper);
+        introducePageDTO.setDetails(introduceDetailList);
 
         return introducePageDTO;
     }

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

@@ -40,6 +40,7 @@
           <if test="deptVitalPageVO.deptName!=null and deptVitalPageVO.deptName!=''">
               AND a.name like CONCAT("%",#{deptVitalPageVO.deptName},"%")
           </if>
+        order by gmt_modified desc
     </select>
 
 </mapper>