From f491d30b0a69148bd0991b3d5b1c4cf9f8216949 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 12 一月 2024 09:52:39 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 106 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 60 insertions(+), 46 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 f07f6d4..ddce8ee 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,6 +3,8 @@
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.configItemWarehouse.dao.ConfigItemWarehouseDao;
@@ -11,16 +13,10 @@
import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit;
import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit;
-import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
-import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
-import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderTechnicalService;
import com.zt.life.modules.mainPart.utils.GetFilesPath;
import com.zt.life.modules.mainPart.utils.GetShowDictList;
-import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
-import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.service.ProjectService;
-import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.life.modules.testCheckOrder.model.TestCheckOrder;
import com.zt.life.modules.testCheckOrder.service.TestCheckOrderService;
import com.zt.life.sys.service.SysOssConfigService;
@@ -33,14 +29,12 @@
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
@@ -87,6 +81,9 @@
@Autowired
private GetFilesPath getFilesPath;
+ @Autowired
+ private ItemCirculatOrderTechnicalService technicalService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -94,7 +91,10 @@
* @return
*/
public List<ConfigItemWarehouse> page(QueryFilter queryFilter) {
- List<ConfigItemWarehouse> list= baseDao.getList(queryFilter.getQueryParams());
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
+ List<ConfigItemWarehouse> list = baseDao.getList(queryFilter.getQueryParams());
if (list.size() > 0) {
workflowService.getRunFlow(list, "pzxrk");
}
@@ -126,34 +126,40 @@
for (WarehouseConfigItem configItem : configItemDto.getConfigItemList()) {
configItem.setWarehouseId(warehouseId);
- if (configItem.getId() != null) {
- WarehouseConfigItem configItem2 = configItemService.get(configItem.getId());
- if (CommonUtils.isActureChangeData(configItem,configItem2)) {
- configItemService.update(configItem);
+ if (configItem.getItemName() != null) {
+ if (configItem.getId() != null) {
+ WarehouseConfigItem configItem2 = configItemService.get(configItem.getId());
+ if (CommonUtils.isActureChangeData(configItem, configItem2)) {
+ configItemService.update(configItem);
+ }
+ if (CommonUtils.isActureChangeData(configItemDto.getConfigItemWarehouse().getLibraryType(), configItem.getLibraryType())) {
+ configItem.setLibraryType(configItemDto.getConfigItemWarehouse().getLibraryType());
+ configItemService.update(configItem);
+ }
+ } else {
+ Map<String, String> map = new HashMap<>();
+ String pageCode = configItem.getPageCode();
+ if (StringUtils.isNotBlank(pageCode) && "plan,explain,record,report".contains(pageCode)) {
+ map.put("funCode", "test_" + pageCode);
+ configItem.setItemIdentify(sysCodeRuleService.getNewCode(map));
+ }
+ configItem.setLibraryType(configItemDto.getConfigItemWarehouse().getLibraryType());
+ configItem.setWarehouseId(warehouseId);
+ configItem.setProjectId(configItemDto.getConfigItemWarehouse().getProjectId());
+ configItemService.insert(configItem);
}
- } else {
- Map<String, String> map = new HashMap<>();
- String pageCode = configItem.getPageCode();
- if (StringUtils.isNotBlank(pageCode) && "plan,explain,record,report".contains(pageCode)) {
- map.put("funCode", "test_" + pageCode);
- //map.put("projectId",configItemDto.getProjectId().toString());
- configItem.setItemIdentify(sysCodeRuleService.getNewCode(map));
+ Long checkId = configItem.getCheckId();
+ if (checkId != null) {
+ TestCheckOrder testCheckOrder = testCheckOrderService.get(checkId);
+ if (testCheckOrder.getConfigItemId() == null) {
+ Long configItemId = configItem.getId();
+ testCheckOrder.setConfigItemId(configItemId);
+ testCheckOrder.setConfigOrderId(warehouseId);
+ testCheckOrderService.update(testCheckOrder);
+ }
}
- configItem.setWarehouseId(warehouseId);
- configItem.setProjectId(configItemDto.getConfigItemWarehouse().getProjectId());
- configItemService.insert(configItem);
+ sysOssConfigService.updateOss(configItem.getId(), configItem.getFiles());// 淇濆瓨闄勪欢
}
- Long checkId = configItem.getCheckId();
- if (checkId != null) {
- TestCheckOrder testCheckOrder = testCheckOrderService.get(checkId);
- if (testCheckOrder.getConfigItemId() == null) {
- Long configItemId = configItem.getId();
- testCheckOrder.setConfigItemId(configItemId);
- testCheckOrder.setConfigOrderId(warehouseId);
- testCheckOrderService.update(testCheckOrder);
- }
- }
- sysOssConfigService.updateOss(configItem.getId(), configItem.getFiles());// 淇濆瓨闄勪欢
}
for (WarehouseCmAudit cmAudit : configItemDto.getCmAuditList()) {
@@ -188,14 +194,13 @@
return true;
}
- public ConfigItemWarehouseDto getDto(Long projectId, Long warehouseId) {
+ public ConfigItemWarehouseDto getDto(Long projectId, Long warehouseId, String libraryType) {
ConfigItemWarehouseDto data = new ConfigItemWarehouseDto();
if (warehouseId != null) {
data.setId(warehouseId);
ConfigItemWarehouse configItemWarehouse = this.get(warehouseId);
data.setConfigItemWarehouse(configItemWarehouse);
-
- if (projectId == null) {
+ if (configItemWarehouse != null && projectId == null) {
projectId = configItemWarehouse.getProjectId();
}
List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId);
@@ -207,6 +212,7 @@
} else {
ConfigItemWarehouse configItemWarehouse = new ConfigItemWarehouse();
+ configItemWarehouse.setLibraryType(libraryType);
data.setConfigItemWarehouse(configItemWarehouse);
List<?> cmList = baseDao.itemList("warehouse_cm_audit");
List<?> CmAuditList = cmList;
@@ -214,7 +220,15 @@
List<?> qaList = baseDao.itemList("warehouse_qa_audit");
List<?> QaAuditList = qaList;
data.setQaAuditList((List<WarehouseQaAudit>) QaAuditList);
- List<?> resultList = configItemService.ConfigItemList(projectId);
+ List<?> resultList = new ArrayList<>();
+ if ("1".equals(libraryType)) {
+ List<String> srcId = technicalService.getsrcId(projectId);
+/* String ids = String.join(", ", srcId.stream()
+ .map(id -> "\"" + id + "\"")
+ .collect(Collectors.toList()));*/
+ String ids = String.join(", ", srcId);
+ resultList = configItemService.ConfigItemList(projectId, ids);
+ }
List<?> ConfigItemList = resultList;
data.setConfigItemList((List<WarehouseConfigItem>) ConfigItemList);
}
@@ -227,17 +241,17 @@
return data;
}
- public void exportWarehouseOrder(Long id, HttpServletRequest request, HttpServletResponse response) {
+ public void exportWarehouseOrder(Long id, HttpServletRequest request, HttpServletResponse response, String libraryType) {
try {
- ConfigItemWarehouseDto dataObj = this.getDto(null, id);
+ ConfigItemWarehouseDto dataObj = this.getDto(null, id, libraryType);
- String qaAuditorPath = "鏂囦欢鍥剧墖:"+ getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getQaAuditorId()));
+ String qaAuditorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getQaAuditorId()));
dataObj.getConfigItemWarehouse().setQaAuditor(qaAuditorPath);
- String cmAuditorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getCmAuditorId()));
+ String cmAuditorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getCmAuditorId()));
dataObj.getConfigItemWarehouse().setCmAuditor(cmAuditorPath);
- String approvalSignPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getApprovalId()));
+ String approvalSignPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getApprovalId()));
dataObj.getConfigItemWarehouse().setApprovalSign(approvalSignPath);
- String operatorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getOperatorId()));
+ String operatorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getOperatorId()));
dataObj.getConfigItemWarehouse().setOperator(operatorPath);
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
String libraryTypeStr = getShowDictList.getShowDictList(dataObj.getConfigItemWarehouse().getLibraryType(), "library_type", false);
--
Gitblit v1.9.1