Merge remote-tracking branch 'origin/master'

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

@@ -148,9 +148,30 @@ public class PlanFacade extends PlanServiceImpl {
             }
             // 获取明细信息
             List<PlanDetailDTO> PlanDetailDatas = sysSetFacade.getByPlanIds(ids);
+            List<PlanDetailDTO> sysSetInfoData = BeanUtil.listCopyTo(PlanDetailDatas, PlanDetailDTO.class);
+            List<PlanDetailDTO> planDetailParent = new ArrayList<>();//父级数据
+            List<PlanDetailDTO> planDetailSub = new ArrayList<>();//子级数据
+            //分离数据，-1分父级菜单
+            for (PlanDetailDTO dataDeta : sysSetInfoData) {
+                if (dataDeta.getParentId() == (-1)) {
+                    planDetailParent.add(dataDeta);
+                } else {
+                    planDetailSub.add(dataDeta);
+                }
+            }
+            //把子级数据，放在父级下
+            Map<Long, List<PlanDetailDTO>> mapParentId = planDetailSub.stream().collect(Collectors.groupingBy(PlanDetailDTO::getParentId));
+            for (Long key : mapParentId.keySet()) {
+                for (PlanDetailDTO sysPlanInfos : planDetailParent) {
+                    if (sysPlanInfos.getId().equals(key)) {
+                        sysPlanInfos.setPlanDetails(mapParentId.get(key));
+                    }
+                }
+            }
+
             Map<Long, List<PlanDetailDTO>> map = new HashMap<>();
             // 获取所有用户开通的产品信息
-            map = EntityUtil.makeEntityListMap(PlanDetailDatas, "planId");
+            map = EntityUtil.makeEntityListMap(planDetailParent, "planId");
             if (map.size() > 0) {
                 for (PlanInfoPageDTO planInfo : planInfos) {
                     List<PlanDetailDTO> planDetails = map.get(planInfo.getId());

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

@@ -1,13 +1,16 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.annotation.TokenAuth;
 import com.diagbot.dto.PlanInfoDefaultDTO;
+import com.diagbot.dto.PlanInfoPageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysPlanInfoDTO;
 import com.diagbot.facade.PlanFacade;
 import com.diagbot.vo.HospitalPlanCancelVO;
+import com.diagbot.vo.HospitalPlanPageVO;
 import com.diagbot.vo.HospitalPlanSaveVO;
 import com.diagbot.vo.HospitalPlanVO;
 import com.diagbot.vo.PlanRevStopVO;
@@ -58,14 +61,15 @@ public class PlanController {
         return RespDTO.onSuc(res);
     }
 
-    /*@ApiOperation(value = "分页获取方案配置信息[by:wangfeng]", notes = "分页获取方案配置信息")
+    @ApiOperation(value = "分页获取方案配置信息[by:wangfeng]", notes = "分页获取方案配置信息")
     @PostMapping("/getPlanInfoPages")
     @SysLogger("getPlanInfoPages")
     @Transactional
     public RespDTO<IPage<PlanInfoPageDTO>> getPlanInfoPages(@RequestBody HospitalPlanPageVO hospitalPlanPageVO) {
         IPage<PlanInfoPageDTO> data = planFacade.getPlanInfoPage(hospitalPlanPageVO);
         return RespDTO.onSuc(data);
-    }*/
+    }
+
 
     @ApiOperation(value = "删除方案配置信息[by:wangfeng]", notes = "planId：方案id 必传")
     @PostMapping("/cancelPlanDatas")