From b34230301d2f6618e3f2af344b47ec3737d7007c Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期日, 16 三月 2025 14:30:49 +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 | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 d4a89e3..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,13 +1,15 @@
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 org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -33,11 +35,10 @@
* 工单列表
* @param page
* @param query
- * @param targetId
- * @param isSuperior
* @return
*/
- Page<ComplaintVO> selectComplaintPage1(Page<ComplaintVO> page, @Param("query") ComplaintQuery query, @Param("accountLevel") Integer accountLevel, @Param("targetId") String targetId);
+ Page<ComplaintVO> selectComplaintPage1(Page<ComplaintVO> page, @Param("query") ComplaintQuery query,
+ @Param("accountLevel") Integer accountLevel, @Param("targetId") Long targetId);
@@ -46,7 +47,7 @@
* @param id
* @return
*/
- ComplaintVO getDetail(@Param("id") Long id,@Param("targetId") String targetId, @Param("isSuperior") Integer isSuperior);
+ ComplaintVO getDetail(@Param("id") Long id);
/**
* 获取待办诉求
@@ -56,4 +57,27 @@
* @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") ComplaintQuery query, @Param("loginUserInfo") SystemUserVo loginUserInfo);
+
+ /**
+ * 诉求列表
+ * @param query
+ * @param loginUserInfo
+ */
+ List<ComplaintVO> getList(ComplaintQuery query, SystemUserVo loginUserInfo);
}
--
Gitblit v1.7.1