java/zhihuishenqu.git

			@@ -7,6 +7,7 @@
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import java.util.Date;
			import java.util.List;

			/**
			@@ -49,11 +50,15 @@
			public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "search", required = false)String search,
			@RequestParam(value = "classifyId", required = false)String classifyId,
			@RequestParam(value = "status", required = false)String status,
			@RequestParam(value = "kind", required = false)String kind,
			@RequestParam(value = "userId", required = false)String userId,
			@RequestParam(value = "userIds", required = false)String userIds,
			@RequestParam(value = "communityId", required = false)String communityId);
			@RequestParam(value = "communityId", required = false)String communityId,
			@RequestParam(value = "isDisplay", required = false)String isDisplay,
			@RequestParam(value = "startTime", required = false) Date startTime,
			@RequestParam(value = "endTime", required = false) Date endTime);

			@GetMapping("/NeedProblem/getMyJoinNeedProblemList")
			public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
			@@ -62,7 +67,10 @@
			@RequestParam(value = "status", required = false)String status,
			@RequestParam(value = "kind", required = false)String kind,
			@RequestParam(value = "userIds", required = false)String userIds,
			@RequestParam(value = "userId", required = false)String userId);
			@RequestParam(value = "userId", required = false)String userId,
			@RequestParam(value = "isDisplay", required = false)String isDisplay,
			@RequestParam(value = "startTime", required = false) Date startTime,
			@RequestParam(value = "endTime", required = false) Date endTime);


			@GetMapping("/NeedProblem/getDetails")
			@@ -119,8 +127,10 @@

			@GetMapping("/NeedTask/getNeedTaskList")
			public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageNum") int pageSize,
			@RequestParam(value = "unitId", required = false) String unitId);
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "unitId", required = false) String unitId,
			@RequestParam(value = "kind", required = false) String kind,
			@RequestParam(value = "status", required = false) String status);

			@GetMapping("/NeedTask/getNeedTaskDetails")
			public R getNeedTaskDetails(@RequestParam("id") String id);
			@@ -250,7 +260,8 @@
			public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "communityId", required = false)String communityId,
			@RequestParam(value = "unitId", required = false)String unitId);
			@RequestParam(value = "unitId", required = false)String unitId,
			@RequestParam(value = "meritId", required = false) String meritId);

			@GetMapping("/ResourceSharing/getResourceSharingDetails")
			public R getResourceSharingDetails(@RequestParam("id") String id);
			@@ -378,6 +389,22 @@
			public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item);


			@GetMapping("/FightConvenient/selectUserList")
			public R selectUserList(@RequestParam("communityId") String communityId,
			@RequestParam("phoneOrname") String phoneOrname);



			@GetMapping("/FightConvenient/selectUserListB")
			public R selectUserListB(@RequestParam("communityId") String communityId,
			@RequestParam("phoneOrname") String phoneOrname);



			@GetMapping("/FightConvenient/selectUserBind")
			public R selectUserBind(@RequestParam("communityId") String communityId,
			@RequestParam("userId") String userId);

			/*****************************************************************************************************
			*
			* 用户积分任务完成情况
			@@ -409,6 +436,18 @@
			@PostMapping("/IntegratingTask/upIntegral")
			public R upIntegral(@RequestBody NewFightIntegral item);


			/**
			* 每日签到记录列表前15条
			* @param userId
			* @param communityId
			* @return
			*/
			@GetMapping("/IntegratingTask/getEverydayList")
			public R getEverydayList(@RequestParam("userId") String userId,
			@RequestParam("communityId") String communityId);


			/*******************************************************************************************************************

			*
			@@ -429,7 +468,9 @@
			@RequestParam(value = "goodName", required = false)String goodName,
			@RequestParam(value = "name", required = false)String name,
			@RequestParam(value = "cancelType", required = false)String cancelType,
			@RequestParam(value = "communityId", required = false)String communityId);
			@RequestParam(value = "communityId", required = false)String communityId,
			@RequestParam(value = "merchantId", required = false) String merchantId,
			@RequestParam(value = "orderType", required = false) String orderType);

			/**
			* 分页详情
			@@ -478,4 +519,35 @@
			@RequestParam(value = "communityId") String communityId);











			/**
			* 每日定时清空定时任务
			*/
			@GetMapping("/IntegratingTask/everydaYtruncateData")
			public R truncateData();


			/**
			* 新双争双评需求问题清单任务认领开始结束定时任务
			* @return
			*/
			@PostMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
			public R timedNewFightNeedProblemInventoryHandler();


			//定时任务社区组织共建定时更新项目进度
			@PostMapping("/NewFightCommunity/taskTimed/getListTime")
			public R taskTimedGetListTime();




			}