Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

101captain

2022-02-18 307ea3042f5b03e735772e5d3eaad8d5fc16b6ba

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java

@@ -1,23 +1,21 @@
package com.panzhihua.service_community.api;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper;
import com.panzhihua.service_community.model.dos.ComActReserveOperationRecordDO;
import com.panzhihua.service_community.model.dos.ComActReserveRecordDO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
import com.panzhihua.service_community.service.*;
import com.panzhihua.common.model.dtos.community.reserve.*;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * 预约登记
@@ -94,7 +92,7 @@
     * @return  预约登记详情
     */
    @GetMapping("/admin/detail")
    public R detailReserveAdmin(@RequestParam("reserveId") Long reserveId){
    public R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId) {
        return comActReserveService.detailReserveAdmin(reserveId);
    }

@@ -306,6 +304,17 @@
    }

    /**
     * 查询预约登记题目下属选择项列表
     * 
     * @param reserveSubId
     *            预约登记id
     * @return 查询预约登记题目下属选择项列表
     */
    @GetMapping("/admin/subject/selection/list")
    public List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId) {
        return comActReserveSubService.subjectSelectionListAdmin(reserveSubId);
    }
    /**
     * 分页查询登记明细列表
     * @param detailedAdminDTO  请求参数
     * @return  登记明细列表