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;
@@ -63,7 +64,8 @@
     * @return
     */
    public List<SoftwareTestOrder> page(QueryFilter queryFilter) {
        return baseDao.getList(queryFilter.getQueryParams());
        List<SoftwareTestOrder> list = baseDao.getList(queryFilter.getQueryParams());
        return list;
    }


@@ -84,6 +86,7 @@
        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();
@@ -94,6 +97,7 @@
            if (softwareTestOrderMeasured.getId() != null) {
                softwareTestOrderMeasuredService.update(softwareTestOrderMeasured);
            } else {
                softwareTestOrderMeasured.setOrderId(softwareTestOrderId);
                softwareTestOrderMeasuredService.insert(softwareTestOrderMeasured);
            }
        }
@@ -103,6 +107,7 @@
            if (softwareTestOrderDeliverable.getId() != null) {
                softwareTestOrderDeliverableService.update(softwareTestOrderDeliverable);
            } else {
                softwareTestOrderDeliverable.setOrderId(softwareTestOrderId);
                softwareTestOrderDeliverableService.insert(softwareTestOrderDeliverable);
            }
        }
@@ -116,45 +121,31 @@
        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);
            SoftwareTestOrder softwareTestOrder = this.get(orderId);
            data.setSoftwareTestOrder(softwareTestOrder);

            if (projectId == null)
/*            if (projectId == null)
                projectId = softwareTestOrder.getProjectId();

            data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
 */
            List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId);
            if (deliverableList.isEmpty()) {
                deliverableList = this.deliverableDict();
                deliverableList = deliverableList.stream()
                        .peek(deliverable -> {
                            if (deliverable.getIdentify() == null) {
                                // 修改 identify 字段的值为新值
                                deliverable.setIdentify("1.0.0");
                            }
                        })
                        .collect(Collectors.toList());
            }
            data.setDeliverableList(deliverableList);

            List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
            if (measuredList.isEmpty()) {
                measuredList = this.MeasuredDict();
                measuredList = measuredList.stream()
                        .peek(measured -> {
                            if (measured.getIdentify() == null) {
                                // 修改 identify 字段的值为新值
                                measured.setIdentify("1.0.0");
                            }
                        })
                        .collect(Collectors.toList());
            }
            data.setMeasuredList(measuredList);
        } else {
            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) {
@@ -162,15 +153,6 @@
            data.setProject(projectService.get(projectId));
        }
        return data;
    }


    public List<SoftwareTestOrderDeliverable> deliverableDict() {
        return baseDao.getdeliverableDictList();
    }

    public List<SoftwareTestOrderMeasured> MeasuredDict() {
        return baseDao.getMeasuredDictList();
    }

    public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
@@ -193,7 +175,7 @@
        String testType = "," + dataObj.getSoftwareTestOrder().getTestType1() + ",";
        for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
            String value = dictItemDto.getDictValue();
            String desc = (testType.contains("," + value + ",")?"☑":"□")+dictItemDto.getDictLabel();
            String desc = (testType.contains("," + value + ",") ? "☑" : "□") + dictItemDto.getDictLabel();
            if ((i++) % 2 == 0) {
                testType12.add(desc);
            } else {
@@ -205,7 +187,7 @@
        testType = "," + dataObj.getSoftwareTestOrder().getTestType2() + ",";
        for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
            String value = dictItemDto.getDictValue();
            String desc = (testType.contains("," + value + ",")?"☑":"□")+dictItemDto.getDictLabel();
            String desc = (testType.contains("," + value + ",") ? "☑" : "□") + dictItemDto.getDictLabel();
            if ((i++) % 2 == 0) {
                testType22.add(desc);
            } else {