From ffb18ccfe6750f4a65bce6e02e7f6edb54a5d76f Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 24 九月 2022 23:45:38 +0800
Subject: [PATCH] [修改] 三说代码事件流程代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java |   47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 42 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 87e0bfe..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;
@@ -72,6 +74,11 @@
         ComActSocialProject comActSocialProject=new ComActSocialProject();
         BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
         comActSocialProject.setCreateTime(new Date());
+        if(socialProjectVO.getLevel()>1){
+            ComActSocialProject comActSocialProject1=comActSocialProjectService.getById(socialProjectVO.getParentId());
+            comActSocialProject.setColumnId(comActSocialProject1.getColumnId());
+            comActSocialProject.setSecondColumnId(comActSocialProject1.getSecondColumnId());
+        }
         return R.ok(this.comActSocialProjectService.save(comActSocialProject));
     }
 
@@ -83,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));
     }
 
     /**
@@ -102,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