java/zhihuishenqu.git

			@@ -1702,7 +1702,7 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/import")
			R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入吸毒人员
			@@ -1712,7 +1712,7 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/importDrug")
			R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入社区矫正人员
			@@ -1722,7 +1722,7 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/importCorrect")
			R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入重精人员
			@@ -1732,7 +1732,7 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/importMajor")
			R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入邪教人员
			@@ -1742,7 +1742,7 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/importCult")
			R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入刑释人员
			@@ -1752,7 +1752,7 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/importRehabilitation")
			R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入重点上访人员
			@@ -1762,7 +1762,7 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/importKey")
			R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入服刑人员
			@@ -1772,7 +1772,7 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/importSentence")
			R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入退役军人
			@@ -1782,7 +1782,7 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/importVeterans")
			R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入残疾人
			@@ -1792,7 +1792,17 @@
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/importDisability")
			R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId);
			R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

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

			/**
			* 确认导入实有人口（有则更新，无则新建）
			@@ -1959,6 +1969,23 @@
			*/
			@GetMapping("/questnaire/view/detail")
			R viewDetail(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);

			/**
			* 小程序-新增问卷调查浏览数量
			* @param questId 问卷调查id
			* @return 增加结果
			*/
			@GetMapping("/questnaire/add/view")
			R addView(@RequestParam("questId") Long questId);

			/**
			* 小程序-用户弹窗添加不在提醒接口
			* @param questId 问卷id
			* @param userId 用户id
			* @return 添加结果
			*/
			@GetMapping("/questnaire/add/noNotice")
			R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId);

			/**
			* 社区后台-查询问卷调查详情
			@@ -3765,6 +3792,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 统计结果