From 1396acef66ba418b71c24e4fc9740f4d6aefcd7f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 二月 2025 00:31:36 +0800
Subject: [PATCH] 诉求详情增加办理进度信息

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
index cadc31e..42a86bb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -9,7 +9,6 @@
 import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO;
 import com.panzhihua.sangeshenbian.model.entity.Complaint;
 import com.panzhihua.common.exceptions.ServiceException;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.sangeshenbian.enums.ReportTypeEnum;
 import com.panzhihua.sangeshenbian.model.dto.*;
 import com.panzhihua.sangeshenbian.model.entity.*;
@@ -30,7 +29,6 @@
 import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
 import com.panzhihua.sangeshenbian.service.ISystemUserService;
 import lombok.RequiredArgsConstructor;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
@@ -38,7 +36,6 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
-import java.util.List;
 
 import static cn.hutool.core.util.ObjectUtil.isNull;
 
@@ -154,6 +151,9 @@
             List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list();
             detail.setComplaintFlows(list);
         }
+        //查询办理进度
+        List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id).list();
+        detail.setComplaintProgresses(list);
         return detail;
     }
 
@@ -161,13 +161,14 @@
      * 办理进度录入
      *
      * @param dto
-     * @param userId
+     * @param loginUserInfoVO
      */
     @Override
-    public void saveProcess(ComplaintProcessDTO dto,Long userId) {
+    public void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO) {
         ComplaintProgress complaintProgress = BeanUtil.copyProperties(dto, ComplaintProgress.class);
         complaintProgress.setCreateTime(new Date());
-        complaintProgress.setCreateBy(userId);
+        complaintProgress.setCreateBy(loginUserInfoVO.getUserId());
+        complaintProgress.setCreateByName(loginUserInfoVO.getName());
         complaintProgressService.save(complaintProgress);
     }
 

--
Gitblit v1.7.1