联讯物业系统后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
java110
2023-05-30 3d8ec5c23ef49d0908195c8b5b892920a46aaa8c 
 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});