From 09e19d4defad238ecf28a5749a4ce64904fa76b0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 21 二月 2024 15:33:25 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java
index cf3ba03..fbb1b8a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java
@@ -6,6 +6,8 @@
import com.zt.common.db.query.QueryFilter;
import com.zt.common.service.BaseService;
import com.zt.common.utils.UUIDUtil;
+import com.zt.core.context.User;
+import com.zt.core.context.UserContext;
import com.zt.life.export.dto.WordFile;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.configItemOutbound.dao.ConfigItemOutboundDao;
@@ -98,6 +100,11 @@
* @return
*/
public List<ConfigItemOutbound> page(QueryFilter queryFilter) {
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ Long deptId = user.getDeptId();
+ queryFilter.getQueryParams().put("secretClass", secretClass);
+ queryFilter.getQueryParams().put("deptId", deptId);
List<ConfigItemOutbound> list = baseDao.getList(queryFilter.getQueryParams());
if (list.size() > 0) {
workflowService.getRunFlow(list, "pzxck");
@@ -130,6 +137,7 @@
for (OutboundConfigItem configItem : configItemDto.getConfigOutboundList()) {
configItem.setOutboundId(OutboundId);
+ configItem.setWarehouseDetailId(configItem.getSelectId());
if (configItem.getId() != null) {
outboundItemService.update(configItem);
} else {
@@ -214,8 +222,9 @@
}
public void downloadFiles(HttpServletResponse response, HttpServletRequest request, Long id) {
- String projectName="鍑哄簱鏂囦欢";
+ ConfigItemOutboundDto data = this.getDto(null, id);
+ String projectName = data.getProject().getSoftwareName() + "鍑哄簱鏂囦欢";
List<SysOss> list = baseDao.getFilesByBusiId(id);
- sysOssConfigService.downloadFilesByosList(request,response,list,projectName);
+ sysOssConfigService.downloadFilesByosList(request, response, list, projectName);
}
}
--
Gitblit v1.9.1