提交修改

101captain

2021-08-19 9d0d3070c1e95b61440368bd58a325c15c7f99e1

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

@@ -19,6 +19,7 @@
import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.dtos.community.wallet.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
@@ -1794,6 +1795,16 @@
    R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入低保户
     *
     * @param list        低保户数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importLowSecurity")
    R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 确认导入实有人口（有则更新，无则新建）
     *
     * @param list        用户信息
@@ -1883,16 +1894,25 @@
     * @return
     */
    @PostMapping("/questnaire/addquestnaire")
    R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
    R addQuestnaire(@RequestBody QuestnaireVO questnaireVO);

    /**
     * 社区问卷列表
     * 小程序-社区问卷列表
     *
     * @param pageQuestnaireDTO
     * @return
     * @param pageQuestnaireDTO 请求参数
     * @return  社区问卷列表
     */
    @PostMapping("/questnaire/pagequestnaire")
    R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId);
    R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);

    /**
     * 社区后台-社区问卷列表
     *
     * @param pageQuestnaireDTO 请求参数
     * @return  社区问卷列表
     */
    @PostMapping("/questnaire/admin/pagequestnaire")
    R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);


    /**
@@ -1912,7 +1932,7 @@
     * @return
     */
    @PostMapping("/questnaire/editquestnairedo")
    R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId);
    R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo);

    /**
     * 删除问卷  ——隐藏
@@ -1940,6 +1960,23 @@
     */
    @GetMapping("/questnaire/view")
    R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);

    /**
     * 小程序-问卷调查详情
     * @param userId    用户id
     * @param questId   问卷id
     * @return  问卷调查详情
     */
    @GetMapping("/questnaire/view/detail")
    R viewDetail(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);

    /**
     * 社区后台-查询问卷调查详情
     * @param questId   问卷id
     * @return  问卷调查详情
     */
    @GetMapping("/questnaire/admin/detail")
    R QuesDetail(@RequestParam("questId") Long questId);

    /**
     * 用户问卷调查详细
@@ -1986,7 +2023,7 @@
     * @param usersAnswerQuestnaireVO 填写情况
     */
    @PostMapping("/questnaire/usersanswequestnaire")
    R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId);
    R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO);

    /**
     * 店铺列表-分页查询
@@ -3738,6 +3775,38 @@
    R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询用户交易记录总额
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录总额
     */
    @PostMapping("/user/wallet/trade/total")
    R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询用户导出数据
     * @param pageTradeAdminDTO 请求参数
     * @return  用户导出数据
     */
    @PostMapping("/user/wallet/trade/export")
    R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 导出奖励台账数据
     * @param pageTradeAdminDTO 请求参数
     * @return  奖励台账数据
     */
    @PostMapping("/user/wallet/trade/reward/export")
    R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询社区统计数据
     * @param pageTradeAdminDTO 查询社区统计数据
     * @return  社区统计数据
     */
    @PostMapping("/user/wallet/trade/statistics")
    R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果
@@ -4131,6 +4200,9 @@
    @PostMapping("timedTaskActivityNotice")
    R timedTaskActivityNotice();

    @PostMapping("timedTaskQuestionnaire")
    R timedTaskQuestionnaire();

    /**
     * 查询社区所有列表
     * @return  社区列表
@@ -4154,4 +4226,27 @@
    @PostMapping("/switch/community/search/distance/list")
    R communitySwitchSearchDistanceList(@RequestBody SearchCommunityDTO communityDTO);

    /**
     * 问卷调查统计汇总
     * @param summaryDTO   请求参数
     * @return  统计汇总
     */
    @PostMapping("/questnaire/statisticsSummary")
    R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO);

    /**
     * 问卷调查统计汇总导出数据查询
     * @param questId   调查问卷id
     * @return  调查统计汇总导出数据
     */
    @GetMapping("/questnaire/statisticsSummary/export")
    R statisticsSummaryExport(@RequestParam("questId") Long questId);

    /**
     * 问卷调查统计汇总表头统计
     * @param questId   调查问卷id
     * @return  问卷调查统计汇总表头统计数据
     */
    @GetMapping("/questnaire/statisticsSummary/header")
    R statisticsSummaryHeader(@RequestParam("questId") Long questId);
}