From 6424521a768125e66b64a23d2094e05eb95b105f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 11:30:14 +0800
Subject: [PATCH] bug修复

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
index 88154d4..b98b028 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -1,10 +1,17 @@
 package com.panzhihua.service_community.api;
 
-import com.panzhihua.common.model.dtos.community.reserve.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.vos.R;
-import com.panzhihua.service_community.service.ComActReserveAnswerContentService;
-import com.panzhihua.service_community.service.ComActReserveRecordService;
-import com.panzhihua.service_community.service.ComActReserveService;
+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.service_community.service.*;
+import com.panzhihua.common.model.dtos.community.reserve.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,6 +32,10 @@
     private ComActReserveRecordService comActReserveRecordService;
     @Resource
     private ComActReserveAnswerContentService comActReserveAnswerContentService;
+    @Resource
+    private ComActReserveOperationRecordService comActReserveOperationRecordService;
+    @Resource
+    private ComActReserveSubService comActReserveSubService;
 
     /**
      * 社区后台-分页查询预约登记列表
@@ -86,6 +97,32 @@
         return comActReserveService.detailReserveAdmin(reserveId);
     }
 
+    /**
+     * 预约登记详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId,@RequestParam("isBack") Integer isBack){
+        if(id!=null){
+            return comActReserveService.getById(id,userId,recordId,isBack);
+        }
+        return R.fail();
+    }
+
+    /**
+     *
+     */
+
+    /**
+     * 小程序提交预约/登记
+     * @param comActReserveCommitVO
+     * @return
+     */
+    @PostMapping("/commit")
+    public R commit(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
+        return comActReserveService.commit(comActReserveCommitVO);
+    }
     /**
      * 社区后台-根据社区id统计预约类数据
      * @param makeStatisticsDTO   请求参数
@@ -216,9 +253,73 @@
         return comActReserveService.listReserveAdmin(communityId);
     }
 
+    /**
+     * 导出登记明细数据
+     * @param reserveId 登记id
+     * @return  登记明细数据
+     */
     @GetMapping("/admin/register/list/export")
     public R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId){
         return comActReserveAnswerContentService.exportRegisterAdmin(reserveId);
     }
 
+    /**
+     * 我的预约/登记
+     * @param pageUserReserveDTO
+     * @return
+     */
+    @PostMapping("/userReserveList")
+    public R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO){
+        return comActReserveService.pageReserveList(pageUserReserveDTO);
+    }
+    /**
+     * 取消预约/登记
+     */
+    @PostMapping("/cancelReserve")
+    public R userCancelReserve(@RequestBody CancelRecordDTO cancelRecordDTO){
+        return comActReserveRecordService.cancel(cancelRecordDTO);
+    }
+
+    /**
+     * 预约详情操作记录
+     */
+    @PostMapping("/detailOperation")
+    public R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO){
+        return comActReserveOperationRecordService.detailOperationRecord(comActReserveOperationRecordDO);
+    }
+
+    /**
+     * 查询预约登记题目列表
+     * @param reserveId 预约登记id
+     * @return  约登记题目列表
+     */
+    @GetMapping("/admin/subject/list")
+    public R subjectListAdmin(@RequestParam("reserveId") Long reserveId){
+        return comActReserveSubService.subjectListAdmin(reserveId);
+    }
+
+    /**
+     * 分页查询登记明细列表
+     * @param detailedAdminDTO  请求参数
+     * @return  登记明细列表
+     */
+    @PostMapping("/admin/register/detailed/list")
+    public R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO){
+        return comActReserveAnswerContentService.registerDetailedListAdmin(detailedAdminDTO);
+    }
+
+    @GetMapping("/admin/register/detailed/detail")
+    public R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId){
+        return comActReserveRecordService.registerDetailedDetailAdmin(reserveRecordId);
+    }
+
+    /**
+     * 小程序查询所有进行中的预约登记
+     * @param communityId   社区id
+     * @return  社区所有进行中的预约登记列表
+     */
+    @GetMapping("/list")
+    public R list(@RequestParam("communityId") Long communityId){
+        return comActReserveService.reserveListApplets(communityId);
+    }
 }

--
Gitblit v1.7.1