Changes

jinlin

2023-11-15 de02e2ab7f6b63ce92f712bf81de829c97289ca8

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

@@ -8,6 +8,7 @@
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;
@@ -79,6 +80,7 @@
    public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) {
        Long softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
        if (softwareTestOrderId != null)

            baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
        else {
            Map<String, String> map = new HashMap<>();
@@ -124,6 +126,7 @@
            data.setId(orderId);
            SoftwareTestOrder softwareTestOrder = this.get(orderId);
            data.setSoftwareTestOrder(softwareTestOrder);

            projectId = softwareTestOrder.getProjectId();

            data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
@@ -134,30 +137,31 @@
            List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
            data.setMeasuredList(measuredList);
        } else {
            List<?> testItemResult = baseDao.dictList("testItem_type");
            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");
            List<?> productLibraryResult = baseDao.dictList("product_library_file",projectCode);
            List<?> deliverableList = productLibraryResult;
            data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
        }

        if (data.getTestAgencyInfo() == null)
            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));

        if (projectId != null) {
            data.setProjectId(projectId);
            data.setProject(projectService.get(projectId));
        }

        if (data.getTestAgencyInfo() == null)
            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));

        return data;
    }

    public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
        WordFile wordFile = new WordFile();
        wordFile.setModulePath("aaaa");
        wordFile.setWordName("aaa");
        SoftwareTestOrderDto dataObj = this.getDto(id, null);
        try {
            SoftwareTestOrderDto dataObj = this.getDto(null, id);

        List<DictDto> userDicts = sysDictTypeService.getUserDicts();
        DictDto testType1Dict = userDicts.stream()
@@ -198,9 +202,9 @@
        dataObj.getSoftwareTestOrder().setTestType21(testType21);
        dataObj.getSoftwareTestOrder().setTestType22(testType22);

        List<Object> measuredList = new ArrayList<>();

        try {
            WordFile wordFile = new WordFile();
            wordFile.setModulePath("测试委托单.docx");
            wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_测试委托单");
            wordFileService.exportWordFile(request, dataObj, wordFile, response);
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();