From 6b1c7e3fa773aa75ea34b346d4104ba70064f52c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 31 八月 2023 14:35:53 +0800
Subject: [PATCH] 调整设备状态解析2
---
igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java b/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java
index 0ee730e..9dd246d 100644
--- a/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java
+++ b/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java
@@ -42,6 +42,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -292,8 +293,20 @@
@RequestMapping("/init-inout-data")
@ResponseBody
public PageResponse<String> initInoutData(@RequestBody BaseParam param) {
- inoutCommonManager.initInoutScreen(param.getDeptId());
- return new PageResponse<String>(RespCodeEnum.CODE_0000.getCode(), "鎴愬姛锛�");
+
+ if (null == param.getCompanyId()) {
+ IUser user = ContextUtil.getLoginUser();
+
+ param.setCompanyId(user.getCompanyId());
+
+ if (null == param.getDeptId()) {
+ param.setDeptId(ContextUtil.subDeptId(user));
+ }
+ }
+
+ inoutCommonManager.initInoutScreen(param.getCompanyId(),param.getDeptId());
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎴愬姛锛�");
}
/**
@@ -373,7 +386,21 @@
@RequestMapping("/init-check-data")
@ResponseBody
public PageResponse<String> initCheckData(@RequestBody BaseParam param) {
- inoutCommonManager.initInoutScreen(param.getCompanyId());
+
+ if (null == param.getCompanyId()) {
+ IUser user = ContextUtil.getLoginUser();
+
+ param.setCompanyId(user.getCompanyId());
+
+ if (null == param.getDeptId()) {
+ param.setDeptId(ContextUtil.subDeptId(user));
+ }
+ }
+
+
+ inoutCommonManager.initInoutScreen(param.getCompanyId(),param.getDeptId());
+
+
return new PageResponse<String>(RespCodeEnum.CODE_0000.getCode(), "鎴愬姛锛�");
}
@@ -430,7 +457,7 @@
view.addObject(Constant.MODEL_KEY_DEPT_ID, iDept.getId());
// 浠撳簱鍒楄〃
- List<Depot> listDepot = commonManager.listDepotByDeptId(true, iDept.getId());
+ List<Depot> listDepot = commonManager.listDepotByDeptId(user.getCompanyId(), iDept.getId());
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
// 搴撳尯鍒楄〃
--
Gitblit v1.9.3