From 8e2d30fd6ac9c8cd3ee6d68c8fd575848f37390d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 31 八月 2021 10:42:13 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
index d9439b0..a745232 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
@@ -1,11 +1,16 @@
 package com.panzhihua.service_community.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
 import com.panzhihua.service_community.dao.ComActReserveSubMapper;
 import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
 import com.panzhihua.service_community.service.ComActReserveSubService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @auther lyq
@@ -16,4 +21,23 @@
 @Service
 public class ComActReserveSubServiceImpl extends ServiceImpl<ComActReserveSubMapper, ComActReserveSubDO> implements ComActReserveSubService {
 
+    /**
+     * 查询预约登记题目列表
+     * @param reserveId 预约登记id
+     * @return  约登记题目列表
+     */
+    @Override
+    public R subjectListAdmin(Long reserveId){
+        List<ComActReserveSubListVO> resultList = new ArrayList<>(100);
+        resultList.add(new ComActReserveSubListVO("nub","序号"));
+        resultList.add(new ComActReserveSubListVO("nickName","用户昵称"));
+        List<ComActReserveSubListVO> list = this.baseMapper.getReserveSubjectList(reserveId);
+        if(list != null && !list.isEmpty()){
+            resultList.addAll(list);
+        }
+        resultList.add(new ComActReserveSubListVO("id","登记流水"));
+        resultList.add(new ComActReserveSubListVO("time","登记时间"));
+        return R.ok(resultList);
+    }
+
 }

--
Gitblit v1.7.1