Changes

jinlin

2023-11-22 9ccaff1031985417c58a0c6d9528fd621ca0a80b

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

@@ -15,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;
@@ -25,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;


@@ -58,6 +58,12 @@
    @Autowired
    private GetShowDictList getShowDictList;

    @Autowired
    private SysOssConfigService sysOssConfigService;

    @Autowired
    private SysOssService sysOssService;

    /**
     * 分页查询
     *
@@ -66,6 +72,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;
    }

@@ -87,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());
@@ -119,6 +129,7 @@
        } else {
            testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
        }
        sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 保存附件
        return true;
    }

@@ -141,11 +152,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);
        }
@@ -210,35 +222,35 @@
            dataObj.getSoftwareTestOrder().setTestType22(testType22);

            //通用字典列表字符串生成
            String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel().toString(), "critical_level");
            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");
               SoftwareTestOrderMeasured newMeasured = new SoftwareTestOrderMeasured();
           }
            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");
            String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(), "software_type", false);
            dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);

            String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(), "test_basis");
            String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(), "test_basis", true);
            dataObj.getSoftwareTestOrder().setTestBasisStr(testBasisStr);

            String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard");
            String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard", true);
            dataObj.getSoftwareTestOrder().setTestStandardStr(testStandardStr);

            String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel().toString(), "test_level");
            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");
            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");
            String articleNatureStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getArticleNature(), "article_nature", false);
            dataObj.getSoftwareTestOrder().setArticleNatureStr(articleNatureStr);

            String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(), "is_or_not");
            String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(), "is_or_not", false);
            dataObj.getSoftwareTestOrder().setSampleStatusStr(sampleStatusStr);

            WordFile wordFile = new WordFile();