From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintMapper.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 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 15a4188..24852ce 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,13 +1,16 @@
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;
+import com.panzhihua.sangeshenbian.warpper.MgtComplaintQuery;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -28,12 +31,24 @@
*/
Page<ComplaintVO> selectComplaintPage(Page<ComplaintVO> page, @Param("query") ComplaintQuery query, @Param("targetId") String targetId, @Param("isSuperior") Integer isSuperior);
+
+ /**
+ * 工单列表
+ * @param page
+ * @param query
+ * @return
+ */
+ Page<ComplaintVO> selectComplaintPage1(Page<ComplaintVO> page, @Param("query") ComplaintQuery query,
+ @Param("accountLevel") Integer accountLevel, @Param("targetId") Long targetId);
+
+
+
/**
* 工单详情
* @param id
* @return
*/
- ComplaintVO getDetail(Long id);
+ ComplaintVO getDetail(@Param("id") Long id);
/**
* 获取待办诉求
@@ -43,4 +58,34 @@
* @return
*/
Page<ComplaintTodoVO> getTodoList(Page<ComplaintTodoVO> page, @Param("targetId") String targetId, @Param("isSuperior") int isSuperior);
+
+
+ /**
+ * 获取超时未评价的数据
+ * @return
+ */
+ List<Complaint> getTimeoutAndNotComment();
+
+ /**
+ * 诉求分页列表
+ * @param page
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
+ Page<ComplaintVO> pageList(Page<ComplaintVO> page, @Param("query") MgtComplaintQuery query, @Param("loginUserInfo") SystemUserVo loginUserInfo);
+
+ /**
+ * 诉求列表
+ * @param query
+ * @param loginUserInfo
+ */
+ List<ComplaintVO> getList( @Param("query") MgtComplaintQuery query, @Param("loginUserInfo") SystemUserVo loginUserInfo);
+
+ /**
+ * 管理后台-获取诉求详情
+ * @param id
+ * @return
+ */
+ ComplaintVO getDetailBg(Long id);
}
--
Gitblit v1.7.1