From e97716e13dc30f6bf3909d01dc1fc2916eb53901 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 10:54:03 +0800
Subject: [PATCH] 审批校验
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 5fc4cb2..8a81c0d 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
@@ -92,10 +92,14 @@
vos.add(new OrderNodeVo("鍙戣捣鎶曡瘔",order.getCompanyUser(),order.getComplaintTime(), null));
}
if (order.getInTime()!=null){
- vos.add(new OrderNodeVo("鍝嶅簲鎶曡瘔",order.getInUser(),order.getInTime(), null));
+ vos.add(new OrderNodeVo("澶勭悊涓�",order.getInUser(),order.getInTime(), null));
}
if (order.getResultTime()!=null){
- vos.add(new OrderNodeVo("鎶曡瘔缁撴灉",order.getExecuteUser(),order.getResultTime(), order.getComplaintResult()));
+ if (order.getComplaintStatus()==-1){
+ vos.add(new OrderNodeVo("宸查┏鍥�",order.getExecuteUser(),order.getResultTime(), order.getComplaintResult()));
+ } else {
+ vos.add(new OrderNodeVo("宸插姙缁�",order.getExecuteUser(),order.getResultTime(), order.getComplaintResult()));
+ }
}
return vos;
}
@@ -126,6 +130,7 @@
.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