新增查询未绑定网格接口

lidongdong

2023-10-30 2b1a2bbe4240deb8a56f3fadbced0cbb4fa87137

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java

@@ -11,6 +11,7 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
import com.panzhihua.common.model.vos.jinhui.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -200,6 +201,16 @@
        return jinhuiCommunityService.getListCategories(pageNum, pageSize);
    }



    @ApiOperation(value = "便民服务商家入驻")
    @PostMapping("/merchant/addData")
    public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item)
    {
        item.setAuditType("1");
        item.setCreatedBy(getUserId()+"");
        return jinhuiCommunityService.merchantAddData(item);
    }

    /***************************************************************************************************
     *
@@ -638,7 +649,7 @@
    public R articleGetList(@RequestParam("pageNum") int pageNum,
                            @RequestParam("pageSize")  int pageSize)
    {
        return jinhuiCommunityService.articleGetList(pageNum,pageSize,"1");
        return jinhuiCommunityService.articleGetList(pageNum,pageSize,"1","1");
    }

    /**
@@ -651,6 +662,43 @@
    public R articleGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.articleGetDetails(id);
    }



    /*************************************************************************************************************
     *
     *                   金汇体验活动
     *
     ***************************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "体验活动列表", response = JinhuiExperienceActivityVO.class)
    @GetMapping("/experienceGetList")
    public R experienceGetList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize")  int pageSize,
                               @RequestParam(value = "activityName", required = false) String activityName,
                               @RequestParam(value = "activityType", required = false) String activityType,
                               @RequestParam(value = "starTime", required = false) Date starTime,
                               @RequestParam(value = "endTime", required = false) Date endTime)
    {
        return jinhuiCommunityService.experienceGetList(pageNum,pageSize,activityName,activityType,starTime,endTime);
    }

    /**
     * 单个详情
     * @param id
     * @return
     */
    @ApiOperation(value = "体验活动单个详情", response = JinhuiExperienceActivityVO.class)
    @GetMapping("/experienceGetDetails")
    public R experienceGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.experienceGetDetails(id,getUserId()+"");
    }


@@ -704,4 +752,159 @@
    }


    /**
     * 填写反馈接口
     * @return
     */
    @ApiOperation(value = "金汇报名体验填写反馈接口")
    @GetMapping("/applyExperienceFilIn")
    public R filIn(@RequestParam("activityId") String activityId,
                   @RequestParam("content") String content)
    {
        return jinhuiCommunityService.filIn(getUserId()+"",activityId,content);
    }


    /******************************************************************************************************
     *
     *                    金汇家园
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "金汇家园列表", response = JinhuiArticleManagementVO.class)
    @GetMapping("/homeGetList")
    public R homeGetList(@RequestParam("pageNum") int pageNum,
                         @RequestParam("pageSize")  int pageSize)
    {
        return jinhuiCommunityService.articleGetList(pageNum,pageSize,null,"2");
    }

    /**
     * 详情
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇家园详情", response = JinhuiArticleManagementVO.class)
    @GetMapping("/homeGetDetails")
    public R homeGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.articleGetDetails(id);
    }


    /************************************************************************************************************
     *
     *
     *                         用户提交办理 /JinhuiWorkGuide/
     *
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "我的提交办事指南列表",response = JinhuiQuestnaireUserAnswerVO.class)
    @GetMapping("/answer/getList")
    public R answerGetList(@RequestParam("pageNum") int pageNum,
                           @RequestParam("pageSize") int pageSize,
                           @RequestParam(value = "transactType", required = false) String transactType)
    {
        return jinhuiCommunityService.answerGetList(pageNum,pageSize,getUserId()+"",transactType);
    }

    /**
     * 获取详情
     * @param id
     * @return
     */
    @ApiOperation(value = "我的提交办事指南详情",response = JinhuiQuestnaireUserAnswerVO.class)
    @GetMapping("/answer/getDetails")
    public R answerGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.answerGetDetails(id);
    }

    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "我的提交办事指南申请办理")
    @PostMapping("/answer/addData")
    public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
    {
        item.setUserId(getUserId()+"");
        item.setTransactType("0");
        return jinhuiCommunityService.answerAddData(item);
    }

    /**
     * 编辑
     * @param item
     * @return
     */
    @ApiOperation(value = "我的提交办事指南申请编辑")
    @PostMapping("/answer/editData")
    public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
    {
        return jinhuiCommunityService.answerEditData(item);
    }

    /**
     * 删除
     * @param id
     * @return
     */
    @ApiOperation(value = "我的提交办事指南申请删除")
    @DeleteMapping("/answer/expurgateData")
    public R answerExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.answerExpurgateData(id);
    }


    /****************************************************************************************************************
     *
     *
     *                                  金汇慈善公益
     *
     *
     ******************************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */

    @ApiOperation(value = "金汇慈善公益列表",response = JinhuiCharityVO.class)
    @GetMapping("/getCharityList")
    public R getCharityList(@RequestParam("pageNum") int pageNum,
                            @RequestParam("pageSize") int pageSize,
                            @RequestParam(value = "title", required = false) String title,
                            @RequestParam(value = "label", required = false) String label,
                            @RequestParam(value = "state", required = false) String state)
    {
        return jinhuiCommunityService.getCharityList(pageNum,pageSize,title,label,state);
    }


    /**
     * 获取详情
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇慈善公益详情",response = JinhuiCharityVO.class)
    @GetMapping("/getCharityDetails")
    public R getCharityDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.getCharityDetails(id);
    }


}