From 4ad4b51a4fb177eafee8a3a355496e7b6c1be662 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 11 七月 2024 16:24:46 +0800
Subject: [PATCH] 花城 小程序签退打卡获取积分详情报错2
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
index 56cfcea..dd7d331 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -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);
@@ -377,6 +388,22 @@
@PostMapping("/FightConvenient/editMerchantData")
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);
/*****************************************************************************************************
*
@@ -512,17 +539,13 @@
* 新双争双评需求问题清单 任务认领 开始 结束 定时任务
* @return
*/
- @GetMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
+ @PostMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
public R timedNewFightNeedProblemInventoryHandler();
-
-
-
-
-
-
-
+ //定时任务 社区组织共建 定时更新项目进度
+ @PostMapping("/NewFightCommunity/taskTimed/getListTime")
+ public R taskTimedGetListTime();
--
Gitblit v1.7.1