From 3cc5256ecb6f34d0bfe0e13903f8a87cf5fcce91 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 28 六月 2024 11:15:56 +0800
Subject: [PATCH] 花城 需求清单列表新增显示隐藏字段 新增认领人数字段 新增时间段筛选功能
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index 0c1b896..22304f4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -62,7 +62,7 @@
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
- comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
+// comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
}
@@ -173,6 +173,25 @@
}
return communityService.detailEasyPhoto(id, userId);
}
+
+
+ /**
+ * 随手拍删除
+ *
+ * @param id
+ * 随手拍主键
+ * 登录用户id
+ * @return 详情内容
+ */
+ @ApiOperation(value = "删除随手拍", response = ComActEasyPhotoVO.class)
+ @DeleteMapping("easyphoto/{id}")
+ public R deleteEasyPhoto(@PathVariable("id") Long id) {
+ Long userId = this.getUserId();
+ return communityService.deleteEasyPhoto(id, userId);
+ }
+
+
+
@ApiOperation(value = "随手拍详情-脱敏", response = ComActEasyPhotoVO.class)
@GetMapping("detailEasyPhotoDesensitize")
@ApiImplicitParam(name = "id", value = "随手拍主键")
@@ -254,13 +273,15 @@
@PostMapping("pagemicrowish")
public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO)
{
- if(StringUtils.isEmpty(comActMicroWishVO.getHandleId()))
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
+ }
+
+ if(!StringUtils.isEmpty(comActMicroWishVO.getHandleId()))
{
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if (loginUserInfo != null) {
- comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
- comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
- }
+ comActMicroWishVO.setCommunityId(null);
}
comActMicroWishVO.setIsApplets(1);
comActMicroWishVO.setIsPageMyWish(null);
@@ -320,6 +341,14 @@
return communityService.detailMicroWish(id, userId);
}
+
+ @ApiOperation(value = "删除心愿")
+ @PostMapping("deletemicrowish")
+ public R deleteMicrowish(@RequestParam("id") Long id) {
+ return communityService.deletemicrowish(id);
+ }
+
+
@ApiOperation(value = "心愿详情-脱敏", response = ComActMicroWishVO.class)
@GetMapping("microwishDesensitize")
@ApiImplicitParam(name = "id", value = "微心愿主键")
--
Gitblit v1.7.1