From 0a7159370767b04ef9243f18270d155d527691d4 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 11:42:15 +0800
Subject: [PATCH] 审批修改，时间倒叙
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 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 3e7842c..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())
);
@@ -140,25 +145,26 @@
if (StringUtils.isEmpty(entity.getExecuteDeptName()) && entity.getExecuteDeptName()!=null){
entity.setExecuteDeptName(deptService.getDeptAllName(entity.getExecuteDeptId()));
}
- if (entity.getCompanyId()==null
- || StringUtils.isEmpty(entity.getCompanyName())
- || StringUtils.isEmpty(entity.getCompanyUser())
- || StringUtils.isEmpty(entity.getCompanyPhone())
- ){
- throw new BaseException("鎶曡瘔浼佷笟涓嶈兘涓虹┖锛�");
- }
- if (entity.getExecuteDeptId() == null
- || StringUtils.isEmpty(entity.getExecuteDeptName())
- ){
- throw new BaseException("鎶曡瘔鍗曚綅涓嶈兘涓虹┖锛�");
- }
- if (StringUtils.isEmpty(entity.getComplaintType())){
- throw new BaseException("璇烽�夋嫨瑕佹姇璇夌被鍨嬶紒");
- }
- if (StringUtils.isEmpty(entity.getComplaintReason())){
- throw new BaseException("璇峰～鍐欐姇璇夊唴瀹癸紒");
- }
if (entity.getId()==null){
+ if (entity.getCompanyId()==null
+ || StringUtils.isEmpty(entity.getCompanyName())
+ || StringUtils.isEmpty(entity.getCompanyUser())
+ || StringUtils.isEmpty(entity.getCompanyPhone())
+ ){
+ throw new BaseException("鎶曡瘔浼佷笟涓嶈兘涓虹┖锛�");
+ }
+ if (entity.getExecuteDeptId() == null
+ || StringUtils.isEmpty(entity.getExecuteDeptName())
+ ){
+ throw new BaseException("鎶曡瘔鍗曚綅涓嶈兘涓虹┖锛�");
+ }
+ if (StringUtils.isEmpty(entity.getComplaintType())){
+ throw new BaseException("璇烽�夋嫨瑕佹姇璇夌被鍨嬶紒");
+ }
+ if (StringUtils.isEmpty(entity.getComplaintReason())){
+ throw new BaseException("璇峰～鍐欐姇璇夊唴瀹癸紒");
+ }
+
if (entity.getOrderId()!=null){ //鎵ф硶鍗曟姇璇�
int count = this.count(lq().eq(EnforceComplaintLog::getOrderId, entity.getOrderId()));
if (count >0){
--
Gitblit v1.9.1