From 7a0c5479c363a10f573aa15a54dc8130eabd47ff Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 29 一月 2024 11:47:53 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
index 7b4337a..89f9c5e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -3,8 +3,11 @@
import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
import com.zt.common.utils.CommonUtils;
+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.baselineRelease.model.BaselineReleaseRemark;
import com.zt.life.modules.configItemWarehouse.dao.ConfigItemWarehouseDao;
import com.zt.life.modules.configItemWarehouse.dto.ConfigItemWarehouseDto;
import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse;
@@ -17,6 +20,7 @@
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.testCheckOrder.model.TestCheckOrder;
import com.zt.life.modules.testCheckOrder.service.TestCheckOrderService;
+import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
@@ -89,6 +93,11 @@
* @return
*/
public List<ConfigItemWarehouse> 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<ConfigItemWarehouse> list = baseDao.getList(queryFilter.getQueryParams());
if (list.size() > 0) {
workflowService.getRunFlow(list, "pzxrk");
@@ -209,12 +218,10 @@
ConfigItemWarehouse configItemWarehouse = new ConfigItemWarehouse();
configItemWarehouse.setLibraryType(libraryType);
data.setConfigItemWarehouse(configItemWarehouse);
- List<?> cmList = baseDao.itemList("warehouse_cm_audit");
- List<?> CmAuditList = cmList;
- data.setCmAuditList((List<WarehouseCmAudit>) CmAuditList);
- List<?> qaList = baseDao.itemList("warehouse_qa_audit");
- List<?> QaAuditList = qaList;
- data.setQaAuditList((List<WarehouseQaAudit>) QaAuditList);
+ List<?> cmList = this.itemCmList("warehouse_cm_audit");
+ data.setCmAuditList((List<WarehouseCmAudit>) cmList);
+ List<?> qaList = this.itemQaList("warehouse_qa_audit");
+ data.setQaAuditList((List<WarehouseQaAudit>) qaList);
List<?> resultList = new ArrayList<>();
if ("1".equals(libraryType)) {
List<String> srcId = technicalService.getsrcId(projectId);
@@ -236,6 +243,13 @@
return data;
}
+ public List<WarehouseCmAudit> itemCmList(String dictType) {
+ return baseDao.itemCmList(dictType);
+ }
+ public List<WarehouseQaAudit> itemQaList(String dictType) {
+ return baseDao.itemQaList(dictType);
+ }
+
public void exportWarehouseOrder(Long id, HttpServletRequest request, HttpServletResponse response, String libraryType) {
try {
ConfigItemWarehouseDto dataObj = this.getDto(null, id, libraryType);
--
Gitblit v1.9.1