Changes

jinlin

2023-11-22 9ccaff1031985417c58a0c6d9528fd621ca0a80b

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java

@@ -27,10 +27,8 @@
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.util.*;
import java.util.stream.Collectors;


@@ -98,6 +96,7 @@
        else {
            Map<String, String> map = new HashMap<>();
            map.put("funCode", "software_test_order");
            map.put("projectId",softwareTestOrderDto.getProjectId().toString());
            softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
            softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
            baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
@@ -153,8 +152,8 @@
        } else {
            Project project = projectService.get(projectId);
            String projectCode = project.getCode();
            String softName =project.getSoftwareName();
            List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softName);
            String softIdentity =project.getSoftwareIdentity();
            List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softIdentity);
            List<?> measuredList = testItemResult;
            data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);

@@ -223,7 +222,7 @@
            dataObj.getSoftwareTestOrder().setTestType22(testType22);

            //通用字典列表字符串生成
            String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel().toString(), "critical_level", false);
            String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel(), "critical_level", false);
            dataObj.getSoftwareTestOrder().setCriticalLevelStr(criticalLevelStr);

            for (SoftwareTestOrderMeasured measured : dataObj.getMeasuredList()) {
@@ -241,7 +240,7 @@
            String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard", true);
            dataObj.getSoftwareTestOrder().setTestStandardStr(testStandardStr);

            String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel().toString(), "test_level", false);
            String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel(), "test_level", false);
            dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);

            String test = dataObj.getSoftwareTestOrder().getOtherRequire();