From ad16e7c6dac7d23b3bb903f1d3750978f1d7066d Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 19 十月 2023 17:39:44 +0800
Subject: [PATCH] 提交贵州毕节大方配置信息
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
index cff4ca8..ca1f629 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
@@ -227,6 +227,9 @@
if (null == data.getIntelCard()) {
data.setIntelCard(data.getUserId());
}
+ if (null == data.getRegisterTime()) {
+ data.setRegisterTime(new Date());
+ }
msg = inoutService.insertData(data);
//鎵ц闄勪欢淇℃伅
@@ -637,7 +640,6 @@
param.setCompanyId(user.getCompanyId());
}
param.setDeptId(ContextUtil.subDeptId(user));
-
param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
List<InoutNoticeIn> list = inoutManagerService.listNoticeIn(param);
@@ -671,8 +673,8 @@
//鑾峰彇浠撳簱淇℃伅
List<Depot> depotList = coreCommonService.getCacheDepotList(param.getCompanyId(), param.getDeptId());
- Map<String,String> map = new HashMap<>();
- if(depotList != null && depotList.size() > 0){
+ Map<String, String> map = new HashMap<>();
+ if (depotList != null && depotList.size() > 0) {
for (Depot depot : depotList) {
map.put(depot.getId(), depot.getName());
}
@@ -680,7 +682,7 @@
//璧嬪�间粨搴撳悕绉�
for (InoutNoticeOut inoutNoticeOut : list) {
- if(map.get(inoutNoticeOut.getDepotId()) != null){
+ if (map.get(inoutNoticeOut.getDepotId()) != null) {
inoutNoticeOut.setDepotName(map.get(inoutNoticeOut.getDepotId()));
}
}
--
Gitblit v1.9.3