Merge remote-tracking branch 'origin/huacheng' into huacheng

huanghongfa

2022-04-13 7335fc82791bdc7f71aa4fe9765045b8d476e9cd

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
@@ -24,7 +25,9 @@
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
@@ -9500,6 +9503,108 @@
    R fiveCount(@RequestParam("reserveId") Long reserveId);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActEasyPhotoMember/del")
    R comActEasyPhotoMemberDelete(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActEasyPhotoMember/queryAll")
    R comActEasyPhotoMemberSelectAll(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActEasyPhotoMember/{id}")
    R comActEasyPhotoMemberSelectOne(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActEasyPhotoMember")
    R comActEasyPhotoMemberInsert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);

    /**
     * 修改数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActEasyPhotoMember/update")
    R comActEasyPhotoMemberUpdate(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);

    /**
     * 分页查询所有数据
     *
     * @param comActAcidRecordDTO 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActAcidRecord/queryAll")
    R selectAllComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActAcidRecord/{id}")
    R selectOneComActAcidRecord(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActAcidRecord")
    R insertComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);

    /**
     * 修改数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAcidRecord/update")
    R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActAcidRecord/del")
    R deleteComActAcidRecord(@RequestParam("id") Long id);

    @PostMapping("/comActAcidRecord/export")
    R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);


    /**
     * 5项常规统计
     * @return
     */
    @GetMapping("/comActAcidRecord/fiveCount")
    R comActAcidRecordFiveCount();


    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体