From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java b/service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java
index 8ff9009..46cb400 100755
--- a/service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java
+++ b/service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java
@@ -9,6 +9,7 @@
import com.java110.po.activitiesType.ActivitiesTypePo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -100,14 +101,28 @@
*/
@RequestMapping(value = "/queryActivitiesType", method = RequestMethod.GET)
public ResponseEntity<String> queryActivitiesType(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "defaultShow", required=false) String defaultShow,
+ @RequestParam(value = "typeCd", required=false) String typeCd,
+ @RequestParam(value = "typeName", required=false) String typeName,
@RequestParam(value = "page") int page,
- @RequestParam(value = "defaultShow", required = false) String defaultShow,
@RequestParam(value = "row") int row) {
ActivitiesTypeDto activitiesTypeDto = new ActivitiesTypeDto();
activitiesTypeDto.setPage(page);
activitiesTypeDto.setRow(row);
activitiesTypeDto.setDefaultShow(defaultShow);
activitiesTypeDto.setCommunityId(communityId);
+ if(!StringUtil.isEmpty(defaultShow)){
+ activitiesTypeDto.setDefaultShow(defaultShow);
+ }
+ if(!StringUtil.isEmpty(typeCd)){
+ activitiesTypeDto.setTypeCd(typeCd);
+ }
+ if(!StringUtil.isEmpty(typeCd)){
+ activitiesTypeDto.setTypeCd(typeCd);
+ }
+ if(!StringUtil.isEmpty(typeName)){
+ activitiesTypeDto.setTypeName(typeName);
+ }
return getActivitiesTypeBMOImpl.get(activitiesTypeDto);
}
}
--
Gitblit v1.8.0