From 17bd0962b7caba32f35d29a1082e7c998342e65d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 二月 2025 00:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java
index 6f0c7a9..dd03fb5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java
@@ -2,10 +2,15 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.sangeshenbian.model.dto.ComplaintCompletionDTO;
+import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.sangeshenbian.model.dto.*;
 import com.panzhihua.sangeshenbian.model.entity.Complaint;
 import com.baomidou.mybatisplus.extension.service.IService;
+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.model.vo.DispatchVO;
 
@@ -24,20 +29,31 @@
 
     /**
      * 诉求列表
+     *
      * @param query
+     * @param loginUserInfoVO
      * @return
      */
-    Page<ComplaintVO> complaintList(ComplaintQuery query);
+    Page<ComplaintVO> complaintList(ComplaintQuery query, LoginUserInfoVO  loginUserInfoVO);
 
+    /**
+     * 工单详情
+     * @param id
+     * @return
+     */
+    ComplaintVO detail(Long id);
     /**
      * 保存办理进度
      * @param dto
+     * @param userId
      */
-    void saveProcess(ComplaintProcessDTO dto);
+    void saveProcess(ComplaintProcessDTO dto, Long userId);
 
     /**
      * 办理结果录入
+     *
      * @param dto
+     * @param loginUserInfoVO
      */
     void saveResult(ComplaintCompletionDTO dto);
 
@@ -69,4 +85,13 @@
     void delayAudit(ComplaintDelayAuditDTO complaintDelayAuditDTO, LoginUserInfoVO loginUserInfoVO);
 
     List<DispatchVO> getDispatchList(LoginUserInfoVO loginUserInfoVO);
+    void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO);
+
+    /**
+     * 获取待办诉求
+     * @param page
+     * @param loginUserInfo
+     * @return
+     */
+    Page<ComplaintTodoVO> getTodoList(BasePage page, LoginUserInfoVO loginUserInfo);
 }

--
Gitblit v1.7.1