爱心义仓修改

puhanshu

2021-10-13 f7c16d24f7cb0d2b9e03ec24bfdbb72a11def5f9

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

@@ -36,6 +36,8 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
@@ -100,6 +102,13 @@
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
@@ -152,6 +161,9 @@
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -225,6 +237,7 @@
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
@@ -278,10 +291,15 @@
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
import com.panzhihua.common.model.vos.community.warehouse.WarehouseDonatesExcelVO;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
@@ -3195,7 +3213,7 @@
     * @return 删除结果
     */
    @PostMapping("common/data/special/delete")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam("communityId") Long communityId);

    /**
     * 办事指南_新增
@@ -3603,6 +3621,16 @@
     */
    @PostMapping("/common/data/population/house/delete")
    R deleteHouses(@RequestBody List<Long> Ids);

    /**
     * 新增实有房屋信息
     *
     * @param houseEditAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/insert")
    R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO);

    /**
     * 实有房屋统计
@@ -5810,14 +5838,14 @@
    R timedTaskEldersAuthJobHandler();

    /**
     * 定时任务扫描上月高龄认证使用视频认证的用户添加成功记录
     * 身份认证定时任务
     * @return  执行结果
     */
    @PostMapping("/elders/auth/record/task")
    R timedTaskEldersAuthRecordJobHandler();

    /**
     * 定时任务每月1号0点统计高龄老人本期应该认证总人数
     * 身份认证定时任务
     * @return  执行结果
     */
    @PostMapping("/elders/authRecords/statistics")
@@ -6139,6 +6167,16 @@
    R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 查询房屋二级级联菜单后台
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @PostMapping("/common/data/population/second/listBack")
    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 微心愿处理人列表
     * @param communityId   社区id
     * @param type  处理人类型（1.后台用户  2.党员  3.志愿者）
@@ -6359,9 +6397,10 @@
    /**
     * 获取所有产品分类
     * @return
     * @param merchantId
     */
    @GetMapping("/convenient/product-category/all")
    R getAllProductCategory();
    R getAllProductCategory(@RequestParam("merchantId") Long merchantId);

    /**
     * 获取该社区商家数量大于0的分类
@@ -6473,4 +6512,347 @@
     */
    @GetMapping("/convenient/product/shelf-num")
    R getProductShelfNum(@RequestParam("merchantId") Long merchantId);

    /**
     * 群团组织成员列表-小程序分页查询
     * @param pageClusterMemberDto  请求参数
     * @return  群团组织成员列表
     */
    @PostMapping("/cluster/member/page/applets")
    R pageClusterMemberApplets(@RequestBody PageClusterMemberDto pageClusterMemberDto);

    /**
     * 群团组织列表-小程序查询社区群团组织列表
     * @param communityId   社区id
     * @return  社区群团组织列表
     */
    @GetMapping("/cluster/list/applets")
    R listClusterApplets(@RequestParam("communityId") Long communityId);

    /**
     * 分页查询群团组织列表
     * @param pageClusterAdminDto  请求参数
     * @return  群团组织列表
     */
    @PostMapping("/cluster/page/admin")
    R pageClusterAdmin(@RequestBody PageClusterAdminDto pageClusterAdminDto);

    /**
     * 新增群团组织
     * @param addClusterAdminDto    请求参数
     * @return  新增结果
     */
    @PostMapping("/cluster/add/admin")
    R addClusterAdmin(@RequestBody AddClusterAdminDto addClusterAdminDto);

    /**
     * 修改群团组织
     * @param editClusterAdminDto   请求参数
     * @return  修改结果
     */
    @PostMapping("/cluster/edit/admin")
    R editClusterAdmin(@RequestBody EditClusterAdminDto editClusterAdminDto);

    /**
     * 删除群团组织
     * @param id    组织id
     * @return  删除结果
     */
    @GetMapping("/cluster/delete/admin")
    R deleteClusterAdmin(@RequestParam("id") Long id);

    /**
     * 群团组织详情
     * @param id    组织id
     * @return  群团组织详情
     */
    @GetMapping("/cluster/detail/admin")
    R detailClusterAdmin(@RequestParam("id") Long id);

    /**
     * 分页查询群团组织成员列表
     * @param pageClusterMemberAdminDto 请求参数
     * @return  群团组织成员列表
     */
    @PostMapping("/cluster/member/page/admin")
    R pageClusterMemberAdmin(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);

    /**
     * 新增群团组织成员
     * @param addClusterMemberAdminDto  请求参数
     * @return  新增结果
     */
    @PostMapping("/cluster/member/add/admin")
    R addClusterMemberAdmin(@RequestBody AddClusterMemberAdminDto addClusterMemberAdminDto);

    /**
     * 编辑群团组织成员
     * @param editClusterMemberAdminDto 请求参数
     * @return  编辑结果
     */
    @PostMapping("/cluster/member/edit/admin")
    R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto);

    /**
     * 删除群团组织成员
     * @param id    组织成员id
     * @return  删除结果
     */
    @GetMapping("/cluster/member/delete/admin")
    R deleteClusterMemberAdmin(@RequestParam("id") Long id);

    /**
     * 群团组织成员详情
     * @param id    组织成员id
     * @return  群团组织成员详情
     */
    @GetMapping("/cluster/member/detail/admin")
    R detailClusterMemberAdmin(@RequestParam("id") Long id);

    /**
     * 查询系统民族列表
     * @return  民族列表
     */
    @GetMapping("/cluster/member/nation/list/admin")
    R memberNationListAdmin();

    /**
     * 群团组织成员导入
     * @param list  导入数据
     * @param communityId   社区id
     * @param userId    操作用户id
     * @return  导入结果
     */
    @PostMapping("/cluster/member/import/admin")
    R importClusterMember(@RequestBody List<ComClusterMemberExcelVO> list,
                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

    /**
     * 群团组织导出数据查询
     * @param pageClusterMemberAdminDto 请求参数
     * @return  导出数据结果集
     */
    @PostMapping("/cluster/member/export/admin")
    R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);

    /**
     * 社区后台分页查询微心愿
     * @param comActMicroWishVO 请求参数
     * @return  微心愿列表
     */
    @PostMapping("pagemicrowishAdmin")
    R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 小程序四长四员查询居民列表
     */
    @PostMapping("/comActFourMember/member")
    R comActFourMemberQueryMember(@RequestBody CommonPage commonPage);

    /**
     *居民数据详情
     */
    @GetMapping("/comActFourMember/memberDetail")
    R comActFourMemberMemberDetail(@RequestParam("id")Long id);

    /**
     * 根据房屋id列表删除房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 删除结果
     */
    @PostMapping("/common/data/population/house/user/delete")
    R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    /**
     * 新增实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/user/insert")
    public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    /**
     * 编辑实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/user/edit")
    public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    /**
     * 根据id查询
     *
     * @param id
     *            请求参数
     * @return 删除结果
     */
    @GetMapping("/common/data/population/house/user/detail")
    public R detailHousesUser(@RequestParam("id") Long id);

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

    /**
     * 统计查询
     *
     * @param communityId
     * @return 所有数据
     */
    @GetMapping("/comActWarehouseApply/selectStatics")
    public R comActWarehouseApplySelectAll(@RequestParam("communityId") Long communityId);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActWarehouseApply/{id}")
    public R comActWarehouseApplySelectOne(@PathVariable("id") Integer id);

    /**
     * 新增数据
     *
     * @param comActWarehouseApply 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActWarehouseApply")
    public R comActWarehouseApplyInsert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);

    /**
     * 修改数据
     *
     * @param comActWarehouseApply 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActWarehouseApply/update")
    public R comActWarehouseApplyUpdate(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);

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

    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/comActWarehouseApply/getQRCode")
    public R comActWarehouseApplyGetQRCode(@RequestBody QRCodeVO qrCodeVO);

    /**
     * 社区Id查询基础配置
     * @param communityId
     * @return
     */
    @GetMapping("/comActWarehouseBase")
    public R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);

    /**
     * 新增数据
     *
     * @param comActWarehouseBase 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActWarehouseBase")
    public R comActWarehouseBaseInsert(@RequestBody ComActWarehouseBaseVO comActWarehouseBase);

    /**
     * 导出数据
     */
    @PostMapping("/comActWarehouseApply/export")
    public R comActWarehouseApplyExport(@RequestBody CommonPage commonPage);

    /**
     * 后台导入捐赠物品
     * @param list
     * @return
     */
    @PostMapping("/comActWarehouseDonates/import")
    R batchImportWarehouseDonates(@RequestBody List<WarehouseDonatesExcelVO> list);

    /**
     * 后台导出捐赠物品表格
     * @param exportDonatesDTO
     * @return
     */
    @PostMapping("/comActWarehouseDonates/donates/export")
    R exportDonates(@RequestBody ExportDonatesDTO exportDonatesDTO);

    /**
     * 分页查询捐赠物品
     * @param pageDonatesDTO
     * @return
     */
    @PostMapping("/comActWarehouseDonates/donates/page")
    R pageDonates(@RequestBody PageDonatesDTO pageDonatesDTO);

    /**
     * 新增物品捐赠
     * @param comActWarehouseDonatesDTO
     * @return
     */
    @PostMapping("/comActWarehouseDonates/donates/add")
    R addDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);

    /**
     * 查看物品捐赠详情
     * @param donatesId
     * @param isWhich
     * @param userId
     * @return
     */
    @GetMapping("/comActWarehouseDonates/donates/get")
    R getDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("isWhich") Integer isWhich, @RequestParam("userId") Long userId);

    /**
     * 捐赠物品后台签收
     * @param comActWarehouseDonatesDTO
     * @return
     */
    @PostMapping("/comActWarehouseDonates/donates/signing")
    R signingDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);

    /**
     * 用户取消捐赠
     * @param donatesId
     * @param currentUser
     * @return
     */
    @GetMapping("/comActWarehouseDonates/donates/cancel")
    R cancelDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("currentUser") Long currentUser);

    /**
     * 捐赠物品统计查询
     * @param communityId
     * @return
     */
    @GetMapping("/comActWarehouseDonates/donates/statistics")
    R getDonatesStatistics(@RequestParam("communityId") Long communityId);

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