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-basic/src/main/java/com/ld/igds/pest/controller/PestController.java | 46 ++++++++++++----------------------------------
1 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java b/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java
index 404544a..378fd9d 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java
@@ -46,32 +46,6 @@
private PestManager pestManager;
@Autowired
private ConfigGasImg gasImg;
- /**
- * 涓存椂椤甸潰
- *
- * @param depotId
- * @return
- */
- @RequestMapping("/pest-temp")
- public ModelAndView newGas(
- @RequestParam(value = "depotId", required = false) String depotId) {
- ModelAndView view = new ModelAndView();
-
- // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listDepot(null);
- view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
-
- IUser user = ContextUtil.getLoginUser();
- view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
-
- view.addObject("bizType", BizType.PEST.getCode());
-
- String deptId = ContextUtil.subDeptId(user);
- view.addObject("deptId", deptId);
-
- view.setViewName("admin/pest/temp");
- return view;
- }
/**
* 瀹為檯浣跨敤椤甸潰
@@ -85,12 +59,18 @@
@RequestParam(value = "deptId", required = false) String deptId) {
ModelAndView view = new ModelAndView();
- // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listDepot(null);
- view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
-
IUser user = ContextUtil.getLoginUser();
view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
+
+
+ if (StringUtils.isEmpty(deptId)) {
+ deptId = ContextUtil.subDeptId(user);
+ }
+
+ // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
+ List<Depot> listDepot = commonManager.listDepot(deptId);
+ view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
+
view.addObject("bizType", BizType.PEST.getCode());
@@ -155,10 +135,8 @@
/**
*
- * @param depotId
- * 浠撳簱缂栫爜
- * @param checkDate
- * 鐩戞祴鏃堕棿
+ * @param param
+ * 鍙傛暟
* @return
*/
@RequestMapping(value = "/flush-pest")
--
Gitblit v1.9.3