From cb13c23829768b94ab980635a4f1ce5e48457be4 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 16:53:56 +0800
Subject: [PATCH] 用户类型修改
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
index 2ddc13e..52e6bee 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
@@ -18,6 +18,7 @@
import com.project.enforce.mapper.EnforceComplaintLogMapper;
import com.project.enforce.service.IEnforceComplaintLogService;
import com.project.system.service.ISysDeptService;
+import com.project.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -37,6 +38,7 @@
public class EnforceComplaintLogServiceImpl extends ServiceImpl<EnforceComplaintLogMapper, EnforceComplaintLog> implements IEnforceComplaintLogService {
private final ISysDeptService deptService;
+ private final ISysUserService userService;
@Override//鍒楄〃鏌ヨ
@@ -89,16 +91,17 @@
List<OrderNodeVo> vos = new ArrayList<>();
EnforceComplaintLog order = this.getById(id);
if (order.getComplaintTime()!=null){
- vos.add(new OrderNodeVo("鍙戣捣鎶曡瘔",order.getCompanyUser(),order.getComplaintTime(), null));
+ vos.add(new OrderNodeVo("鍙戣捣鎶曡瘔",order.getCompanyUser(),order.getCompanyName(),order.getComplaintTime(), null));
}
- if (order.getInTime()!=null){
- vos.add(new OrderNodeVo("澶勭悊涓�",order.getInUser(),order.getInTime(), null));
+ if (order.getInTime()!=null && StringUtils.isNotEmpty(order.getInUser())){
+
+ vos.add(new OrderNodeVo("澶勭悊涓�",order.getInUser(), userService.getDeptNameByUserId(order.getInId()), order.getInTime(), null));
}
if (order.getResultTime()!=null){
if (order.getComplaintStatus()==-1){
- vos.add(new OrderNodeVo("宸查┏鍥�",order.getExecuteUser(),order.getResultTime(), order.getComplaintResult()));
+ vos.add(new OrderNodeVo("宸查┏鍥�",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
} else {
- vos.add(new OrderNodeVo("宸插姙缁�",order.getExecuteUser(),order.getResultTime(), order.getComplaintResult()));
+ vos.add(new OrderNodeVo("宸插姙缁�",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
}
}
return vos;
@@ -108,7 +111,7 @@
@Transactional
public Boolean inComplaint(ComplaintResultBo bo)
{
- SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId());
return this.update(lu()
.set(EnforceComplaintLog::getInId,loginUser.getUserId())
.set(EnforceComplaintLog::getInUser,loginUser.getNickName())
@@ -125,11 +128,12 @@
if (StringUtils.isEmpty(bo.getResult())){
throw new BaseException("璇峰～鍐欏鐞嗙粨鏋�");
}
- SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId());
return this.update(lu()
.set(EnforceComplaintLog::getResultId,loginUser.getUserId())
.set(EnforceComplaintLog::getResultUser,loginUser.getNickName())
.set(EnforceComplaintLog::getResultTime, DateUtils.getNowDate())
+ .set(EnforceComplaintLog::getComplaintStatus, bo.getComplaintStatus())
.set(EnforceComplaintLog::getComplaintResult, bo.getResult())
.eq(EnforceComplaintLog::getId, bo.getId())
);
--
Gitblit v1.9.1