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/controller/ComplaintController.java | 4 +++-
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintProgress.java | 4 ++++
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 13 +++++++------
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java | 6 +++---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java | 4 ++++
5 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
index 7bed262..ddef1a4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
@@ -67,7 +67,7 @@
@PostMapping("/saveProcess")
@ApiOperation("办理进度录入")
public R<?> saveProcess(@Valid @RequestBody ComplaintProcessDTO dto){
- complaintService.saveProcess(dto,getUserId());
+ complaintService.saveProcess(dto,getLoginUserInfo());
return R.ok();
}
@PostMapping("/saveResult")
@@ -91,6 +91,7 @@
* 诉求下派
*/
@PostMapping("/saveDispatch")
+ @ApiOperation("诉求下派")
public R<?> saveDispatch(@RequestBody ComplaintDispatch dto){
complaintService.saveDispatch(dto, getLoginUserInfo());
return R.ok();
@@ -100,6 +101,7 @@
* 延期申请
*/
@PostMapping("/saveDelay")
+ @ApiOperation(value = "延期申请")
public R<?> saveDelay(@RequestBody ComplaintDelayDTO dto){
complaintService.saveDelay(dto, getLoginUserInfo());
return R.ok();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintProgress.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintProgress.java
index fe85266..230fb57 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintProgress.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintProgress.java
@@ -59,5 +59,9 @@
@TableField("create_by")
private Long createBy;
+ @ApiModelProperty(value = "创建人")
+ @TableField("create_by_name")
+ private String createByName;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
index 45a7c66..7df51f1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
import com.panzhihua.sangeshenbian.model.entity.ComplaintFlow;
+import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -32,4 +33,7 @@
@ApiModelProperty(value = "诉求流转记录")
List<ComplaintFlow> complaintFlows;
+
+ @ApiModelProperty(value = "办理进度")
+ List<ComplaintProgress> complaintProgresses;
}
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 3f7aa57..5f22b3a 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,7 +4,6 @@
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;
@@ -44,10 +43,11 @@
ComplaintVO detail(Long id);
/**
* 保存办理进度
+ *
* @param dto
- * @param userId
+ * @param loginUserInfoVO
*/
- void saveProcess(ComplaintProcessDTO dto, Long userId);
+ void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO);
/**
* 办理结果录入
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