From 33e5113e02e32b8553c5f4edd07eb1f149594f04 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 24 二月 2025 18:59:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 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 dd03fb5..728cb97 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 @@ -4,10 +4,11 @@ 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.entity.ComplaintAuditRecord; +import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress; import com.panzhihua.sangeshenbian.model.query.BasePage; import com.panzhihua.sangeshenbian.model.query.ComplaintQuery; import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO; @@ -44,10 +45,11 @@ ComplaintVO detail(Long id); /** * 保存办理进度 + * * @param dto - * @param userId + * @param loginUserInfoVO */ - void saveProcess(ComplaintProcessDTO dto, Long userId); + void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO); /** * 办理结果录入 @@ -55,8 +57,14 @@ * @param dto * @param loginUserInfoVO */ - void saveResult(ComplaintCompletionDTO dto); + void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO); + /** + * 办理进度列表 + * @param complaintId + * @return + */ + List<ComplaintProgress> progress(Long complaintId); /** * 诉求上报 */ @@ -85,7 +93,6 @@ void delayAudit(ComplaintDelayAuditDTO complaintDelayAuditDTO, LoginUserInfoVO loginUserInfoVO); List<DispatchVO> getDispatchList(LoginUserInfoVO loginUserInfoVO); - void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO); /** * 获取待办诉求 @@ -94,4 +101,11 @@ * @return */ Page<ComplaintTodoVO> getTodoList(BasePage page, LoginUserInfoVO loginUserInfo); + + /** + * 延期情况说明 + * @param complaintId + * @return + */ + ComplaintAuditRecord delayDetail(Long complaintId); } -- Gitblit v1.7.1