From ae2c433ecf08e10d55488320e5db0936ca323710 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 31 五月 2023 20:44:21 +0800
Subject: [PATCH] 扦样提交3
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index 709beec..53ee2c0 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -1,6 +1,8 @@
package com.ld.igds.inout.controller;
+import ch.qos.logback.classic.pattern.ClassNameOnlyAbbreviator;
import com.bstek.bdf2.core.business.IUser;
+import com.bstek.bdf2.core.model.DefaultDept;
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.common.manager.CommonManager;
import com.ld.igds.constant.BizType;
@@ -527,6 +529,7 @@
*/
@RequestMapping("/inout-query")
public PageResponse<InoutData> inoutQuery(@RequestBody InoutParam param) {
+ if(null == param.getCompanyId()) param.setCompanyId(ContextUtil.getCompanyId());
return inoutManager.inoutQuery(param);
}
@@ -738,6 +741,8 @@
view.addObject("bizType", BizType.INOUT_IN.getCode());
view.addObject("type", InoutConstant.TYPE_IN);
view.addObject("deptId", deptId);
+ DefaultDept dept = commonManager.getSubDept(user, deptId);
+ view.addObject("deptName", dept.getName());
//鍏ュ簱娴佺▼
String inoutProgress = inoutCommonManager.getInoutProgressConf(user.getCompanyId(), deptId, InoutConstant.TYPE_IN);
@@ -790,12 +795,7 @@
*/
@RequestMapping("/update-sample")
public PageResponse<InoutCheckData> updateSample(@RequestBody InoutCheckData data) {
- try {
- return inoutManager.updateSampleData(data);
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父:{}", e);
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴寮傚父锛�" + e.getMessage(), null);
- }
+
+ return inoutManager.updateSampleData(data);
}
}
\ No newline at end of file
--
Gitblit v1.9.3