From 7e566b12d5e6b089ad37ea7bf7dafb2df23bfac2 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 16 十一月 2023 08:54:33 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 122 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 8 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 b69fe1c..9b28ab3 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,21 +1,33 @@
package com.zt.life.modules.project.service;
import com.zt.common.service.BaseService;
+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.export.service.WordFileService;
import com.zt.life.modules.project.dao.SoftwareTestOrderDao;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.model.SoftwareTestOrder;
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.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.sys.service.SysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
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.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
@@ -38,6 +50,11 @@
@Autowired
private SysCodeRuleService sysCodeRuleService;
+ @Autowired
+ private SysDictTypeService sysDictTypeService;
+ @Autowired
+ private WordFileService wordFileService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -45,7 +62,8 @@
* @return
*/
public List<SoftwareTestOrder> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<SoftwareTestOrder> list = baseDao.getList(queryFilter.getQueryParams());
+ return list;
}
@@ -62,29 +80,33 @@
public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) {
Long softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
if (softwareTestOrderId != null)
+
baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "software_test_order");
+ softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
}
- for (SoftwareTestOrderMeasured softwareTestOrderMeasured : softwareTestOrderDto.getSoftwareTestOrderMeasuredList()) {
+ for (SoftwareTestOrderMeasured softwareTestOrderMeasured : softwareTestOrderDto.getMeasuredList()) {
softwareTestOrderMeasured.setOrderId(softwareTestOrderId);
if (softwareTestOrderMeasured.getId() != null) {
softwareTestOrderMeasuredService.update(softwareTestOrderMeasured);
} else {
+ softwareTestOrderMeasured.setOrderId(softwareTestOrderId);
softwareTestOrderMeasuredService.insert(softwareTestOrderMeasured);
}
}
- for (SoftwareTestOrderDeliverable softwareTestOrderDeliverable : softwareTestOrderDto.getSoftwareTestOrderDeliverableList()) {
+ for (SoftwareTestOrderDeliverable softwareTestOrderDeliverable : softwareTestOrderDto.getDeliverableList()) {
softwareTestOrderDeliverable.setOrderId(softwareTestOrderId);
if (softwareTestOrderDeliverable.getId() != null) {
softwareTestOrderDeliverableService.update(softwareTestOrderDeliverable);
} else {
+ softwareTestOrderDeliverable.setOrderId(softwareTestOrderId);
softwareTestOrderDeliverableService.insert(softwareTestOrderDeliverable);
}
}
@@ -98,12 +120,96 @@
return true;
}
+ public SoftwareTestOrderDto getDto(Long projectId, Long orderId) {
+ SoftwareTestOrderDto data = new SoftwareTestOrderDto();
+ if (orderId != null) {
+ data.setId(orderId);
+ SoftwareTestOrder softwareTestOrder = this.get(orderId);
+ data.setSoftwareTestOrder(softwareTestOrder);
- public List<SoftwareTestOrderDeliverable> deliverableDict() {
- return baseDao.getdeliverableDictList();
+ projectId = softwareTestOrder.getProjectId();
+
+ data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
+
+ List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId);
+ data.setDeliverableList(deliverableList);
+
+ List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
+ data.setMeasuredList(measuredList);
+ } else {
+ Project project = projectService.get(projectId);
+ String projectCode = project.getCode();
+ List<?> testItemResult = baseDao.dictList("testItem_type",projectCode);
+ List<?> measuredList = testItemResult;
+ data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
+
+ List<?> productLibraryResult = baseDao.dictList("product_library_file",projectCode);
+ List<?> deliverableList = productLibraryResult;
+ data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
+ }
+
+ if (projectId != null) {
+ data.setProjectId(projectId);
+ data.setProject(projectService.get(projectId));
+ }
+
+ if (data.getTestAgencyInfo() == null)
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
+
+ return data;
}
- public List<SoftwareTestOrderMeasured> MeasuredDict() {
- return baseDao.getMeasuredDictList();
+ 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"))
+ .collect(Collectors.toList()).get(0);
+
+ List<String> testType11 = new ArrayList<>();
+ List<String> testType12 = new ArrayList<>();
+ List<String> testType21 = new ArrayList<>();
+ List<String> 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();
+ if ((i++) % 2 == 0) {
+ testType12.add(desc);
+ } else {
+ testType11.add(desc);
+ }
+ }
+
+ i = 0;
+ testType = "," + dataObj.getSoftwareTestOrder().getTestType2() + ",";
+ for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
+ String value = dictItemDto.getDictValue();
+ String desc = (testType.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
+ if ((i++) % 2 == 0) {
+ testType22.add(desc);
+ } else {
+ testType21.add(desc);
+ }
+ }
+
+ dataObj.getSoftwareTestOrder().setTestType11(testType11);
+ dataObj.getSoftwareTestOrder().setTestType12(testType12);
+ dataObj.getSoftwareTestOrder().setTestType21(testType21);
+ dataObj.getSoftwareTestOrder().setTestType22(testType22);
+
+ WordFile wordFile = new WordFile();
+ wordFile.setModulePath("娴嬭瘯濮旀墭鍗�.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_娴嬭瘯濮旀墭鍗�");
+ wordFileService.exportWordFile(request, dataObj, wordFile, response);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.9.1