From 3d8ec5c23ef49d0908195c8b5b892920a46aaa8c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 11:42:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
old mode 100644
new mode 100755
index 547ff75..bc91c02
--- a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
+++ b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
@@ -1,8 +1,8 @@
package com.java110.user.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.activitiesBeautifulStaff.ActivitiesBeautifulStaffDto;
-import com.java110.dto.activitiesRule.ActivitiesRuleDto;
+import com.java110.dto.activities.ActivitiesBeautifulStaffDto;
+import com.java110.dto.activities.ActivitiesRuleDto;
import com.java110.dto.questionAnswer.QuestionAnswerDto;
import com.java110.po.activitiesBeautifulStaff.ActivitiesBeautifulStaffPo;
import com.java110.po.activitiesRule.ActivitiesRulePo;
@@ -131,12 +131,17 @@
* @path /app/activitiesRule/queryActivitiesRule
*/
@RequestMapping(value = "/queryActivitiesRule", method = RequestMethod.GET)
- public ResponseEntity<String> queryActivitiesRule(
- @RequestHeader(value = "store-id", required = false) String storeId,
- @RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ public ResponseEntity<String> queryActivitiesRule(@RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestParam(value = "ruleType", required = false) String ruleType,
+ @RequestParam(value = "ruleName", required = false) String ruleName,
+ @RequestParam(value = "activitiesObj", required = false) String activitiesObj,
+ @RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ActivitiesRuleDto activitiesRuleDto = new ActivitiesRuleDto();
+ activitiesRuleDto.setRuleType(ruleType);
+ activitiesRuleDto.setRuleName(ruleName);
+ activitiesRuleDto.setActivitiesObj(activitiesObj);
activitiesRuleDto.setPage(page);
activitiesRuleDto.setRow(row);
activitiesRuleDto.setObjIds(new String[]{storeId, communityId});
@@ -210,9 +215,15 @@
*/
@RequestMapping(value = "/queryActivitiesBeautifulStaff", method = RequestMethod.GET)
public ResponseEntity<String> queryActivitiesBeautifulStaff(@RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestParam(value = "ruleId", required = false) String ruleId,
+ @RequestParam(value = "activitiesNum", required = false) String activitiesNum,
+ @RequestParam(value = "staffName", required = false) String staffName,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ActivitiesBeautifulStaffDto activitiesBeautifulStaffDto = new ActivitiesBeautifulStaffDto();
+ activitiesBeautifulStaffDto.setStaffName(staffName);
+ activitiesBeautifulStaffDto.setRuleId(ruleId);
+ activitiesBeautifulStaffDto.setActivitiesNum(activitiesNum);
activitiesBeautifulStaffDto.setPage(page);
activitiesBeautifulStaffDto.setRow(row);
activitiesBeautifulStaffDto.setStoreId(storeId);
--
Gitblit v1.8.0