From b21945e7dea2daa8b30bee3cdd4bca91277e3b5f Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 29 十一月 2023 09:22:17 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index 55097bb..ecdd3f3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -1,10 +1,12 @@
package com.zt.life.modules.project.service;
import com.zt.common.service.BaseService;
+import com.zt.common.utils.CommonUtils;
import com.zt.core.sys.dto.DictDto;
import com.zt.core.sys.dto.DictItemDto;
import com.zt.core.sys.dto.DictLeafDto;
import com.zt.life.export.dto.WordFile;
+import com.zt.life.modules.mainPart.utils.GetShowDictList;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.project.dao.SoftwareTestOrderDao;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
@@ -13,7 +15,9 @@
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.oss.service.SysOssService;
import com.zt.modules.sys.service.SysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,10 +27,9 @@
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
@@ -38,7 +41,6 @@
*/
@Service
public class SoftwareTestOrderService extends BaseService<SoftwareTestOrderDao, SoftwareTestOrder> {
-
@Autowired
private ProjectService projectService;
@Autowired
@@ -54,6 +56,14 @@
private SysDictTypeService sysDictTypeService;
@Autowired
private WordFileService wordFileService;
+ @Autowired
+ private GetShowDictList getShowDictList;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private SysOssService sysOssService;
/**
* 鍒嗛〉鏌ヨ
@@ -63,6 +73,9 @@
*/
public List<SoftwareTestOrder> page(QueryFilter queryFilter) {
List<SoftwareTestOrder> list = baseDao.getList(queryFilter.getQueryParams());
+ if (list != null && list.size() > 0) {
+ sysOssService.setListOsses(list, "test_order");
+ }
return list;
}
@@ -84,6 +97,9 @@
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "software_test_order");
+ map.put("projectId",softwareTestOrderDto.getProjectId().toString());
+ /* DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ softwareTestOrderDto.getSoftwareTestOrder().getEntrustSignDate();*/
softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
@@ -116,6 +132,7 @@
} else {
testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
}
+ sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
return true;
}
@@ -138,11 +155,12 @@
} else {
Project project = projectService.get(projectId);
String projectCode = project.getCode();
- List<?> testItemResult = baseDao.dictList("testItem_type",projectCode);
+ String softIdentity =project.getSoftwareIdentity();
+ List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softIdentity);
List<?> measuredList = testItemResult;
data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
- List<?> productLibraryResult = baseDao.dictList("product_library_file",projectCode);
+ List<?> productLibraryResult = baseDao.dictList("product_library_file", projectCode,null);
List<?> deliverableList = productLibraryResult;
data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
}
@@ -161,7 +179,7 @@
public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
try {
SoftwareTestOrderDto dataObj = this.getDto(null, id);
-
+ //鐗规畩鍒楄〃鐢熸垚
List<DictDto> userDicts = sysDictTypeService.getUserDicts();
DictDto testType1Dict = userDicts.stream()
.filter(c -> c.getDictType().equals("test_type1"))
@@ -172,13 +190,14 @@
List<HashMap<String, Object>> testType21 = new ArrayList<>();
List<HashMap<String, Object>> testType22 = new ArrayList<>();
+
int i = 0;
String testType = "," + dataObj.getSoftwareTestOrder().getTestType1() + ",";
for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
String value = dictItemDto.getDictValue();
String desc = (testType.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
HashMap<String, Object> stateItem = new HashMap<>();
- stateItem.put("item",desc);
+ stateItem.put("item", desc);
if ((i++) % 2 == 0) {
testType12.add(stateItem);
} else {
@@ -192,7 +211,7 @@
String value = dictItemDto.getDictValue();
String desc = (testType.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
HashMap<String, Object> stateItem = new HashMap<>();
- stateItem.put("item",desc);
+ stateItem.put("item", desc);
if ((i++) % 2 == 0) {
testType22.add(stateItem);
} else {
@@ -205,9 +224,41 @@
dataObj.getSoftwareTestOrder().setTestType21(testType21);
dataObj.getSoftwareTestOrder().setTestType22(testType22);
+ //閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
+ String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel(), "critical_level", false);
+ dataObj.getSoftwareTestOrder().setCriticalLevelStr(criticalLevelStr);
+
+ for (SoftwareTestOrderMeasured measured : dataObj.getMeasuredList()) {
+ String value = measured.getIsMeasured();
+ String isMeasuredStr = getShowDictList.getShowDictList(value, "is_or_not", false);
+ measured.setIsMeasuredStr(isMeasuredStr);
+ }
+
+ String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(), "software_type", false);
+ dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);
+
+ String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(), "test_basis", true);
+ dataObj.getSoftwareTestOrder().setTestBasisStr(testBasisStr);
+
+ String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard", true);
+ dataObj.getSoftwareTestOrder().setTestStandardStr(testStandardStr);
+
+ String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel(), "test_level", false);
+ dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);
+
+ String test = dataObj.getSoftwareTestOrder().getOtherRequire();
+ String otherRequireStr = getShowDictList.getShowDictList(test, "other_require", false);
+ dataObj.getSoftwareTestOrder().setOtherRequireStr(otherRequireStr);
+
+ String articleNatureStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getArticleNature(), "article_nature", false);
+ dataObj.getSoftwareTestOrder().setArticleNatureStr(articleNatureStr);
+
+ String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(), "is_or_not", false);
+ dataObj.getSoftwareTestOrder().setSampleStatusStr(sampleStatusStr);
+
WordFile wordFile = new WordFile();
wordFile.setModulePath("娴嬭瘯濮旀墭鍗�.docx");
- wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_娴嬭瘯濮旀墭鍗�.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_娴嬭瘯濮旀墭鍗�.docx");
wordFileService.exportWordFile(request, dataObj, wordFile, response);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
--
Gitblit v1.9.1