From 878b6958363308a7d07b7b8197dc19662f3e1198 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 15:40:22 +0800
Subject: [PATCH] 获取出入库id，逻辑优化调整
---
fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
index 57431f3..c8b1050 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
@@ -157,14 +157,13 @@
List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
view.put("deptList", deptList);
String deptId = (deptList != null && !deptList.isEmpty()) ? deptList.get(0).getDeptId() : null;
-// view.put("defaultDeptId", deptId != null ? deptId : "00");
- view.put("defaultDeptId","5372001001");
+ view.put("defaultDeptId", deptId != null ? deptId : "5372001001");
//鑾峰彇鎵�鏈変粨搴�
List<GroupDepotData> depotList = groupManager.getDepotData(user.getCompanyId());
view.put("depotList", depotList);
//缁熻淇℃伅
- GroupGisData groupGisData = groupManager.getGisData();
+ GroupGisData groupGisData = groupManager.getGisDataByCompanyId();
view.put("gisData", groupGisData);
return prefix + "/gis_modeling";
@@ -208,6 +207,19 @@
return groupManager.indexDeptList(param);
}
+// /**
+// * 棣栭〉--鎶撴媿璺熻釜淇℃伅
+// *
+// * @param param
+// * @return
+// */
+// @RequestMapping("/index-snap-list")
+// @ResponseBody
+// public PageResponse<List<SnapRecord>> indexSnapList(@RequestBody IgdsBaseParam param) {
+//
+// return groupManager.indexSnapList(param);
+// }
+
/**
* 棣栭〉--鎶撴媿璺熻釜淇℃伅
*
@@ -216,9 +228,9 @@
*/
@RequestMapping("/index-snap-list")
@ResponseBody
- public PageResponse<List<SnapRecord>> indexSnapList(@RequestBody IgdsBaseParam param) {
+ public PageResponse<List<EventInfo>> indexSnapList(@RequestBody IgdsBaseParam param) {
- return groupManager.indexSnapList(param);
+ return groupManager.indexEventInfoList(param);
}
}
--
Gitblit v1.9.3