修改金汇空间申请时间问题

lidongdong

2023-10-18 a51f1570a012d7cbc51b2b01be9e930426a3eecd

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

@@ -10,9 +10,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.jinhui.JinghuiMerchantEvaluateVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.common.model.vos.jinhui.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
@@ -21,6 +19,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -131,9 +130,8 @@
     */
    @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
    @GetMapping("/detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId,
                             @RequestParam("communityId") String communityId) {
        return jinhuiCommunityService.detailWorkGuide(workGuideId, communityId);
    public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId) {
        return jinhuiCommunityService.detailWorkGuide(workGuideId, getCommunityId() + "");
    }

    /**
@@ -170,8 +168,7 @@
     */
    @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class)
    @PostMapping("/merchant/page")
    public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO)
    {
    public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) {
        return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO);
    }

@@ -183,24 +180,22 @@
     */
    @ApiOperation(value = "获取便民服务商家详情", response = ConvenientMerchantVO.class)
    @GetMapping("/merchant/get")
    public R getMerchant(@RequestParam("merchantId") String merchantId)
    {
    public R getMerchant(@RequestParam("merchantId") String merchantId) {
        return jinhuiCommunityService.getMerchant(merchantId);
    }



    /**
     * 分页查询 商家类别
     *
     * @param
     * @return
     */
    @ApiOperation(value = "获取便民服务商家类别列表", response = ConvenientServiceCategoryVO.class)
    @GetMapping("/getCategories")
    public R getListCategories(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize") int pageSize)
    {
        return jinhuiCommunityService.getListCategories(pageNum,pageSize);
                               @RequestParam("pageSize") int pageSize) {
        return jinhuiCommunityService.getListCategories(pageNum, pageSize);
    }


@@ -213,6 +208,7 @@
     **************************************************************************************************/
    /**
     * 商家评论列表
     *
     * @param pageNum
     * @param pageSize
     * @param merchantId
@@ -220,75 +216,266 @@
     */
    @ApiOperation(value = "商家评论列表", response = JinghuiMerchantEvaluateVO.class)
    @GetMapping("/merchantEvaluate/getList")
    public R merchantEvaluateGetList(@RequestParam("pageNum")  int pageNum,
                                     @RequestParam("pageSize")  int pageSize,
                                     @RequestParam("merchantId")   String merchantId)
    {
        return jinhuiCommunityService.merchantEvaluateGetList(pageNum,pageSize,merchantId);
    public R merchantEvaluateGetList(@RequestParam("pageNum") int pageNum,
                                     @RequestParam("pageSize") int pageSize,
                                     @RequestParam("merchantId") String merchantId) {
        return jinhuiCommunityService.merchantEvaluateGetList(pageNum, pageSize, merchantId);
    }

    /**
     * 商家评论列单个详情
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "商家评论列单个详情", response = JinghuiMerchantEvaluateVO.class)
    @GetMapping("/merchantEvaluate/getDetails")
    public R merchantEvaluateGetDetails(@RequestParam("id") String id)
    {
    public R merchantEvaluateGetDetails(@RequestParam("id") String id) {
        return jinhuiCommunityService.merchantEvaluateGetDetails(id);
    }

    /**
     * 商家评论列添加
     *
     * @param
     * @return
     */
    @ApiOperation(value = "商家评论列添加")
    @PostMapping("/merchantEvaluate/addData")
    public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item)
    {
    public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item) {
        return jinhuiCommunityService.merchantEvaluateAddData(item);
    }

    /**
     * 商家评论列编辑
     *
     * @param item
     * @return
     */
    @ApiOperation(value = "商家评论列编辑")
    @PostMapping("/merchantEvaluate/editData")
    public R merchantEvaluateEditData(@RequestBody JinghuiMerchantEvaluateVO item)
    {
    public R merchantEvaluateEditData(@RequestBody JinghuiMerchantEvaluateVO item) {
        return jinhuiCommunityService.merchantEvaluateEditData(item);
    }

    /**
     * 商家评论列删除
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "商家评论列删除")
    @PostMapping("/merchantEvaluate/expurgateData")
    public R merchantEvaluateExpurgateData(@RequestParam("id") String id)
    {
    public R merchantEvaluateExpurgateData(@RequestParam("id") String id) {
        return jinhuiCommunityService.merchantEvaluateExpurgateData(id);
    }


    @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideAppletsVO.class)
    @PostMapping("list")
    @PostMapping("wx/list")
    public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
        pageActWorkGuideDTO.setAreaCode(this.getAreaCode());
        return jinhuiCommunityService.listWorkGuide(pageActWorkGuideDTO);
    }


    @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
    @PostMapping("pageworkguide")
    @PostMapping("wx/pageworkguide")
    public R detailWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
        pageActWorkGuideDTO.setAreaCode(this.getAreaCode());
        return jinhuiCommunityService.pageWorkGuide(pageActWorkGuideDTO);
    }


    /************************************************************************************************
     *
     *
     *                                金汇预约空间模块
     *
     *
     **********************************************************************************************/
    /**
     * 金汇空间预约模块分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "金汇空间预约模块分页查询", response = JinhuiInterspaceVO.class)
    @GetMapping("/interspaceGetList")
    public R interspaceGetList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize") int pageSize,
                               @RequestParam(value = "intendantType", required = false) String intendantType) {
        return jinhuiCommunityService.interspaceGetList(pageNum, pageSize, intendantType);
    }

    /**
     * 金汇空间预约模块单个详情
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇空间详情", response = JinhuiInterspaceVO.class)
    @GetMapping("/interspaceGetDetails")
    public R interspaceGetDetails(@RequestParam("id") String id) {
        return jinhuiCommunityService.interspaceGetDetails(id);
    }


    /**
     * 空间预约分类分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约分类分页查询", response = JinhuiInterspaceTypeVO.class)
    @GetMapping("/interspaceTypeGetList")
    public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum,
                                   @RequestParam("pageSize") int pageSize)
    {
        return jinhuiCommunityService.interspaceTypeGetList(pageNum,pageSize);
    }


    /***************************************************************************************************************
     *
     *
     *                                       空间预约申请
     *
     *
     **************************************************************************************************************/
    /**
     * 空间预约申请分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请分页", response = JinhuiInterspaceApplyForVO.class)
    @GetMapping("/applyFor/getList")
    public R applyForGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "intendantType", required = false) String intendantType,
                             @RequestParam(value = "state", required = false) String state,
                             @RequestParam(value = "interspaceTime",required = false) String interspaceTime,
                             @RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
                             @RequestParam(value = "interspaceId",required = false) String  interspaceId) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType,
                state,interspaceTime,subscribeTimeFrame,interspaceId);
    }

    /**
     * 空间预约申请详情
     *
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请详情", response = JinhuiInterspaceApplyForVO.class)
    @GetMapping("/applyFor/getDetails")
    public R applyForGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.applyForGetDetails(id);
    }

    /**
     * 空间预约申请新增
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请新增")
    @PostMapping("/applyFor/addData")
    public R applyForAddData(@RequestBody JinhuiInterspaceApplyForVO item)
    {
        return jinhuiCommunityService.applyForAddData(item);
    }

    /**
     * 空间预约申请编辑
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请编辑")
    @PostMapping("/applyFor/editData")
    public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item)
    {
        return jinhuiCommunityService.applyForEditData(item);
    }

    /**
     * 空间预约申请删除
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约申请删除")
    @DeleteMapping("/applyFor/expurgateData")
    public R applyForExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.applyForExpurgateData(id);
    }


/******************************************************************************************************************
 *
 *
 *                             金汇微心愿
 *
 *
 ******************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "金汇微心愿列表", response = JinhuiMicroVolunteeringVO.class)
    @GetMapping("/volunteering/getList")
    public R volunteeringGetList(@RequestParam("pageNum") int pageNum,
                                 @RequestParam("pageSize") int pageSize,
                                 @RequestParam(value = "state", required = false)String state)
    {
        return jinhuiCommunityService.volunteeringGetList(pageNum,pageSize,getUserId()+"",state);
    }

    /**
     * 详情
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇微心愿详情", response = JinhuiMicroVolunteeringVO.class)
    @GetMapping("/volunteering/getDetails")
    public R volunteeringGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.volunteeringGetDetails(id);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "金汇微心愿新增")
    @PostMapping("/volunteering/addData")
    public R volunteeringAddData(@RequestBody JinhuiMicroVolunteeringVO item)
    {
        item.setUserId(getUserId()+"");
        return jinhuiCommunityService.volunteeringAddData(item);
    }

    /**
     * 编辑
     * @param item
     * @return
     */
    @ApiOperation(value = "金汇微心愿编辑")
    @PostMapping("/volunteering/editData")
    public R volunteeringEditData(@RequestBody JinhuiMicroVolunteeringVO item)
    {
        return jinhuiCommunityService.volunteeringEditData(item);
    }

    /**
     * 删除
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇微心愿删除")
    @DeleteMapping("/volunteering/expurgateData")
    public R volunteeringExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.volunteeringExpurgateData(id);
    }

}