From c58d64311945d0b324d72002e52dcbbae61bee8e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 01 十一月 2023 22:14:30 +0800
Subject: [PATCH] 人员管理必填项
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 200a5de..e4a9896 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -256,7 +256,9 @@
}
if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
- data.setCheckUser(ContextUtil.getLoginUserCName());
+ if (StringUtils.isEmpty(data.getCheckUser())) {
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ }
data.setProgress(nextProgress);
return data;
}
@@ -397,11 +399,22 @@
}
String loginUser = ContextUtil.getLoginUserCName();
- data.setRegisterUser(loginUser);
- data.setFullWeightUser(loginUser);
- data.setEmptyWeightUser(loginUser);
- data.setHandleUser(loginUser);
- data.setCompleteUser(loginUser);
+ if (StringUtils.isEmpty(data.getRegisterUser())) {
+ data.setRegisterUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getFullWeightUser())) {
+ data.setFullWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getEmptyWeightUser())) {
+ data.setEmptyWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getHandleUser())) {
+ data.setHandleUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getCompleteUser())) {
+ data.setCompleteUser(loginUser);
+ }
+
if (null == data.getCompleteTime()) {
data.setCompleteTime(new Date());
}
@@ -414,7 +427,7 @@
if (null == data.getIntelCard()) {
data.setIntelCard(data.getUserId());
}
- if (null != data.getCheckItems()) {
+ if (null != data.getCheckItems() && StringUtils.isEmpty(data.getCheckUser())) {
data.setCheckUser(loginUser);
}
@@ -628,7 +641,7 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg, data);
}
- if(null != files && files.size()>0){
+ if (null != files && files.size() > 0) {
// 鎵ц闄勪欢淇℃伅
fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
}
@@ -666,7 +679,7 @@
data);
}
- if(null != files && files.size()>0){
+ if (null != files && files.size() > 0) {
// 鎵ц闄勪欢淇℃伅
fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
}
@@ -864,6 +877,7 @@
curData.setCheckTime(new Date());
data.setCheckTime(new Date());
}
+ curData.setCheckUser(data.getCheckUser());
curData.setCheckStatus(data.getCheckStatus());
curData.setFoodYear(data.getFoodYear());
--
Gitblit v1.9.3