Changes

jinlin

2023-11-15 0339de1ea2ddfb101510ddc7b347ee0552cd6a2b

 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.DictList;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
@@ -120,7 +121,7 @@
        return true;
    }

    public SoftwareTestOrderDto getDto(Long orderId, Long projectId) {
    public SoftwareTestOrderDto getDto(Long projectId,Long orderId) {
        SoftwareTestOrderDto data = new SoftwareTestOrderDto();
        if (orderId != null) {
            data.setId(orderId);
@@ -137,8 +138,14 @@
            List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
            data.setMeasuredList(measuredList);
        } else {
            List<SoftwareTestOrderDeliverable> deliverableList = baseDao.getdeliverableDictList();
            List<SoftwareTestOrderMeasured> measuredList = baseDao.getMeasuredDictList();
            List<?> testItemResult = baseDao.dictList("testItem_type");
            List<?> measuredList = testItemResult;
            data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);

            List<?> productLibraryResult = baseDao.dictList("product_library_file");
            List<?> deliverableList = productLibraryResult;
            data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);

            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
        }
        if (projectId != null) {