From ac3cfc47a08ce8e9e99ecc43fdbada396a714def Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 05 一月 2026 21:26:17 +0800
Subject: [PATCH] 调整出入库配置2
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java
index eab1749..2277682 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java
@@ -27,12 +27,8 @@
* 蹇媿閰嶇疆鍒楄〃
*/
@DataProvider
- public List<SnapConf> selectList(SnapConf param) {
- if (null == param) {
- param = new SnapConf();
- param.setCompanyId(ContextUtil.getCompanyId());
- }
- return snapConfService.selectList(param);
+ public List<SnapConf> selectList(String deptId) {
+ return snapConfService.selectList(deptId);
}
/**
@@ -42,12 +38,13 @@
* @return
*/
@DataProvider
- public SnapConf getConfActHour() {
- SnapConf param = new SnapConf();
- param.setCompanyId(ContextUtil.getCompanyId());
- List<SnapConf> list = snapConfService.selectList(param);
+ public SnapConf getConfActHour(String deptId) {
+
+ List<SnapConf> list = snapConfService.selectList(deptId);
if (null == list || list.isEmpty()) {
- return new SnapConf();
+ SnapConf conf = new SnapConf();
+ conf.setDeptId(deptId);
+ return conf;
}
return list.get(0);
}
@@ -59,9 +56,9 @@
* @param items
*/
@DataResolver
- public void updateConf(List<SnapConf> items) {
+ public String updateConf(List<SnapConf> items) {
if (null == items || items.isEmpty()) {
- return;
+ return "鏁版嵁涓虹┖锛屼繚瀛樺け璐�";
}
for (SnapConf conf : items) {
if (StringUtils.isEmpty(conf.getId())) {
@@ -70,6 +67,7 @@
snapConfService.updateData(conf);
}
}
+ return null;
}
@@ -79,7 +77,7 @@
* @param conf
*/
@Expose
- public void updateActHour(SnapConf conf) {
+ public String updateActHour(SnapConf conf) {
if (null == conf.getCompanyId()) {
conf.setCompanyId(ContextUtil.getCompanyId());
@@ -87,9 +85,12 @@
if (null == conf.getDeptId()) {
conf.setDeptId(ContextUtil.subDeptId(null));
}
-
- //鍚屾鏇存柊鎵�鏈夌殑鎵ц鏃堕棿涓�鑷�
- snapConfService.updateActHour(conf);
-
+ if (null == conf.getId()) {
+ snapConfService.insertData(conf);
+ }else {
+ //鍚屾鏇存柊鎵�鏈夌殑鎵ц鏃堕棿涓�鑷�
+ snapConfService.updateActHour(conf);
+ }
+ return null;
}
}
--
Gitblit v1.9.3