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/dao/NeedProblemInventoryDAO.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java
index 13f552c..ca02286 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.partybuilding.NeedProblemClaimDTO;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
import com.panzhihua.common.model.dtos.partybuilding.UserRankDTO;
import org.apache.ibatis.annotations.Mapper;
@@ -20,14 +21,22 @@
public interface NeedProblemInventoryDAO extends BaseMapper<NeedProblemInventoryDTO>
{
- IPage<NeedProblemInventoryDTO> getList(Page page,@Param("kind") String kind,
- @Param("userId") String userId,
- @Param("communityId") String communityId);
+ IPage<NeedProblemInventoryDTO> getList(Page page,
+ @Param("search") String search,
+ @Param("status") String status,
+ @Param("kind") String kind,
+ @Param("userId") String userId,
+ @Param("userIds") String userIds,
+ @Param("communityId") String communityId);
- IPage<NeedProblemInventoryDTO> getMyJoinList(Page page,@Param("kind") String kind,
- @Param("userId") String userId);
+ IPage<NeedProblemInventoryDTO> getMyJoinList(Page page,
+ @Param("search") String search,
+ @Param("status") String status,
+ @Param("kind") String kind,
+ @Param("userIds") String userIds,
+ @Param("userId") String userId);
- NeedProblemInventoryDTO getDetails(@Param("id")String id);
+ NeedProblemInventoryDTO getDetails(@Param("id")String id,@Param("userIds") String userIds);
int addData(@Param("item") NeedProblemInventoryDTO userIds);
@@ -35,4 +44,7 @@
int expurgateData(@Param("id") String id);
+
+ List<NeedProblemInventoryDTO> getTimeList();
+
}
--
Gitblit v1.7.1