From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
index 2c7aa83..c9d9680 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
@@ -4,6 +4,8 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
@@ -20,6 +22,9 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
/**
*
@@ -74,7 +79,12 @@
@ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
ClazzUtils.setIfStringIsEmpty(pageComActSocialWorkerDTO);
- pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
+ LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfoSureNoLogin)) {
+ pageComActSocialWorkerDTO.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
+ } else if (isNull(pageComActSocialWorkerDTO.getCommunityId())) {
+ return R.fail("缺少社区id");
+ }
return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
}
@@ -97,7 +107,7 @@
*/
@GetMapping("/{id}")
@ApiOperation(value = "查询社工详细信息")
- R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
+ R<ComActSocialWorkerVO> details(@PathVariable("id") Long id){
return communityService.comActSocialWorkerDetails(id);
}
@@ -123,10 +133,15 @@
}
-// @GetMapping("/getTemplate")
+ // @GetMapping("/getTemplate")
// @ApiOperation("获取模板")
// public R getTemplate(){
// return R.ok(comactsocialworkerUrl);
// }
+ @ApiOperation("根据社工获取活动")
+ @PostMapping("/activityList")
+ R activityList(@RequestBody CommonPage commonPage){
+ return communityService.activityList(commonPage);
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1