From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java
index dcd9678..380e424 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
 import com.panzhihua.common.model.dtos.partybuilding.UserRankDTO;
+import com.panzhihua.common.model.vos.R;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,11 +18,20 @@
 public interface NeedProblemInventoryService
 {
 
-    IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize, String kind,String userId,String communityId);
+    IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize,
+                                           String search,String status,
+                                           String kind,
+                                           String userIds,
+                                           String userId,
+                                           String communityId);
 
-    IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize, String kind,String userId);
+    IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize,
+                                                 String search,String status,
+                                                 String kind,
+                                                 String userIds,
+                                                 String userId);
 
-    NeedProblemInventoryDTO getDetails(String id);
+    NeedProblemInventoryDTO getDetails(String id,String userIds);
 
     int addData(NeedProblemInventoryDTO item);
 
@@ -29,4 +39,7 @@
 
     int expurgateData(String id);
 
+
+    R timedNewFightNeedProblemInventoryHandler();
+
 }

--
Gitblit v1.7.1