From c40f8e3d2e08e108780091776437242528bf61d6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 20 七月 2022 17:44:56 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java |   42 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
index 7b15fa6..661cfb4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
@@ -3,6 +3,8 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
+import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -88,9 +90,7 @@
      */
     @PostMapping("/update")
     public R update(@RequestBody SocialProjectVO socialProjectVO) {
-        ComActSocialProject comActSocialProject=new ComActSocialProject();
-        BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
-        return R.ok(this.comActSocialProjectService.updateById(comActSocialProject));
+        return R.ok(this.comActSocialProjectService.updateProject(socialProjectVO));
     }
 
     /**
@@ -107,10 +107,42 @@
     /**
      * 小程序详情接口
      * @param id
+     * @param userId
      * @return
      */
     @GetMapping("/getApplet")
-    public R getApplet(@RequestParam("id") Long id){
-        return this.comActSocialProjectService.getByApplet(id);
+    public R getApplet(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId){
+        return this.comActSocialProjectService.getByApplet(id, userId);
+    }
+
+    /**
+     * 分页查询项目报名列表
+     * @param pageProjectSignListDTO
+     * @return
+     */
+    @PostMapping("/signList")
+    public R pageProjectSignList(@RequestBody PageProjectSignListDTO pageProjectSignListDTO) {
+        return comActSocialProjectService.pageProjectSignList(pageProjectSignListDTO);
+    }
+
+    /**
+     * 项目公开报名
+     * @param projectId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/sign")
+    public R signProject(@RequestParam("projectId") Long projectId, @RequestParam("userId") Long userId) {
+        return comActSocialProjectService.signProject(projectId, userId);
+    }
+
+    /**
+     * 分页查询用户报名的项目
+     * @param pageProjectDTO
+     * @return
+     */
+    @PostMapping("/project")
+    public R pageProjectWhichIsSignedByUser(@RequestBody PageProjectDTO pageProjectDTO) {
+        return comActSocialProjectService.pageProjectWhichIsSignedByUser(pageProjectDTO);
     }
 }

--
Gitblit v1.7.1