From 6aa6dc075078cca11be048a267911bd7f74dadcd Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 16 三月 2025 03:48:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintMapper.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintMapper.java
index 5b524f1..21b232f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintMapper.java
@@ -1,9 +1,9 @@
 package com.panzhihua.sangeshenbian.dao;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
 import com.panzhihua.sangeshenbian.model.entity.Complaint;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.panzhihua.sangeshenbian.model.query.BasePage;
 import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
 import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
 import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
@@ -64,4 +64,20 @@
      * @return
      */
     List<Complaint> getTimeoutAndNotComment();
+
+    /**
+     * 诉求分页列表
+     * @param page
+     * @param query
+     * @param loginUserInfo
+     * @return
+     */
+    Page<ComplaintVO> pageList(Page<ComplaintVO> page, @Param("query") ComplaintQuery query, @Param("loginUserInfo") SystemUserVo loginUserInfo);
+
+    /**
+     * 诉求列表
+     * @param query
+     * @param loginUserInfo
+     */
+    List<ComplaintVO> getList(ComplaintQuery query, SystemUserVo loginUserInfo);
 }

--
Gitblit v1.7.1