From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 9e85ca0..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;
@@ -51,7 +53,7 @@
*/
@GetMapping("{id}")
public R selectOne(@PathVariable("id") Long id) {
- return R.ok(this.comActSocialProjectService.getById(id));
+ return this.comActSocialProjectService.getByBackstage(id);
}
/**
* 根据项目id分页获取关联项目
@@ -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