From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java
index f585bb7..59d79de 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java
@@ -16,11 +16,15 @@
*/
package org.springblade.modules.discuss.mapper;
+import io.lettuce.core.dynamic.annotation.Param;
import org.springblade.modules.discuss.dto.UserTopicsDTO;
import org.springblade.modules.discuss.entity.UserTopicsEntity;
+import org.springblade.modules.discuss.excel.UserTopicsExcel;
+import org.springblade.modules.discuss.excel.holdExcel;
import org.springblade.modules.discuss.vo.UserTopicsVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
import java.util.List;
/**
@@ -48,4 +52,11 @@
* @return 用户议题报表集合
*/
public List<UserTopicsDTO> selectUserTopicsList(UserTopicsDTO userTopicsDTO);
+
+ List<UserTopicsExcel> exportUser( @Param("userTopics") UserTopicsVO userTopics);
+ List<UserTopicsExcel> getresultTwo( @Param("userTopics") UserTopicsVO userTopics);
+
+ UserTopicsVO getresult(UserTopicsVO userTopics);
+
+ List<holdExcel> getHouseholdList(UserTopicsVO userTopics);
}
--
Gitblit v1.9.3