Changes

jinlin

2023-11-22 9ccaff1031985417c58a0c6d9528fd621ca0a80b

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

@@ -94,12 +94,9 @@
        if (softwareTestOrderId != null)
            baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
        else {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
            String year = sdf.format(new Date());
            Map<String, String> map = new HashMap<>();
            map.put("funCode", "software_test_order");
            map.put("year",year);
            softwareTestOrderDto.getSoftwareTestOrder().setYear(year);
            map.put("projectId",softwareTestOrderDto.getProjectId().toString());
            softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
            softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
            baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
@@ -155,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);