| | |
| | | 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 = "communityId", required = false)String communityId) |
| | | { |
| | | return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",communityId); |
| | | return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId); |
| | | } |
| | | |
| | | |
| | |
| | | @GetMapping("/getResourceSharingList") |
| | | public R getResourceSharingList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "communityId", required = false)String communityId) |
| | | @RequestParam(value = "communityId", required = false)String communityId, |
| | | @RequestParam(value = "unitId", required = false)String unitId, |
| | | @RequestParam(value = "meritId", required = false) String meritId) |
| | | { |
| | | return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null); |
| | | return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId); |
| | | } |
| | | |
| | | @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class) |
| | |
| | | @PostMapping("/orderAddData") |
| | | public R orderAddData(@RequestBody NewFightShoppingOrderVO item) |
| | | { |
| | | item.setCommunityId(getCommunityId()+""); |
| | | item.setUserId(getUserId()+""); |
| | | item.setOrderType("1"); |
| | | // item.setCommunityId(getCommunityId()+""); |
| | | // item.setUserId(getUserId()+""); |
| | | // item.setOrderType("1"); |
| | | return newStriveForFeign.orderAddData(item); |
| | | } |
| | | |