修改

jinlin

2023-12-08 9b31782deaeaa36efb013f538c99d8f5df94eed4

 modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java

@@ -82,41 +82,22 @@
    }

    public Boolean save(ConfigItemChangeDto configItemDto) {
        Long warehouseId = configItemDto.getConfigItemChange().getId();
        if (warehouseId != null)
        Long changeId = configItemDto.getConfigItemChange().getId();
        if (changeId != null)
            baseDao.updateById(configItemDto.getConfigItemChange());
        else {
            Map<String, String> map = new HashMap<>();
            map.put("funCode", "config_item_warehouse");
            map.put("funCode", "config_item_change");
            map.put("projectId", configItemDto.getProjectId().toString());
            configItemDto.getConfigItemChange().setProjectId(configItemDto.getProjectId());
            configItemDto.getConfigItemChange().setCode(sysCodeRuleService.getNewCode(map));
            baseDao.insert(configItemDto.getConfigItemChange());
            warehouseId = configItemDto.getConfigItemChange().getId();
            changeId = configItemDto.getConfigItemChange().getId();
        }

        for (WarehouseConfigItem configItem : configItemDto.getConfigItemList()) {
            configItem.setWarehouseId(warehouseId);
            if (configItem.getId() != null) {
                if (configItem.getCheckId()!=null){
                    String code ="719CTC-09-ST";
                    String projectCode = configItemDto.getProject().getCode();
                    if (configItem.getItemName().equals("软件测试计划")){
                        code=code+"P";
                    }else if (configItem.getItemName().equals("软件测试说明")){
                        code=code+"D";
                    }else if (configItem.getItemName().equals("软件测试记录")){
                        code=code+"L";
                    }else if (configItem.getItemName().equals("软件测试报告")){
                        code=code+"R";
                    }
                    configItem.setItemIdentify(code+"-"+projectCode);
                }
                configItemService.update(configItem);
            } else {
                configItem.setWarehouseId(warehouseId);
                configItemService.insert(configItem);
            }
        for (WarehouseConfigItem configItem : configItemDto.getConfigChangeList()) {
            configItem.setWarehouseId(changeId);
            configItemService.update(configItem);
            Long checkId = configItem.getCheckId();
            if (checkId != null) {
                TestCheckOrder testCheckOrder = testCheckOrderService.get(checkId);
@@ -130,21 +111,21 @@
        }

        for (WarehouseCmAudit cmAudit : configItemDto.getCmAuditList()) {
            cmAudit.setWarehouseId(warehouseId);
            cmAudit.setWarehouseId(changeId);
            if (cmAudit.getId() != null) {
                cmAuditService.update(cmAudit);
            } else {
                cmAudit.setWarehouseId(warehouseId);
                cmAudit.setWarehouseId(changeId);
                cmAuditService.insert(cmAudit);
            }
        }

        for (WarehouseQaAudit qaAudit : configItemDto.getQaAuditList()) {
            qaAudit.setWarehouseId(warehouseId);
            qaAudit.setWarehouseId(changeId);
            if (qaAudit.getId() != null) {
                qaAuditService.update(qaAudit);
            } else {
                qaAudit.setWarehouseId(warehouseId);
                qaAudit.setWarehouseId(changeId);
                qaAuditService.insert(qaAudit);
            }
        }
@@ -161,35 +142,32 @@
        return true;
    }

    public ConfigItemChangeDto getDto(Long projectId, Long warehouseId) {
    public ConfigItemChangeDto getDto(Long projectId, Long changeId) {
        ConfigItemChangeDto data = new ConfigItemChangeDto();
        if (warehouseId != null) {
            data.setId(warehouseId);
            ConfigItemChange configItemChange = this.get(warehouseId);
        if (changeId != null) {
            data.setId(changeId);
            ConfigItemChange configItemChange = this.get(changeId);
            data.setConfigItemChange(configItemChange);

            if (projectId == null) {
                projectId = configItemChange.getProjectId();
            }
            List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId);
            List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(changeId);
            data.setCmAuditList(CmAuditList);
            List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(warehouseId);
            List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(changeId);
            data.setQaAuditList(QaAuditList);
            List<WarehouseConfigItem> ConfigItemList = configItemService.getList(warehouseId);
            data.setConfigItemList(ConfigItemList);
            List<WarehouseConfigItem> configChangeList = configItemService.getList(changeId);
            data.setConfigChangeList(configChangeList);

        } else {
            ConfigItemChange configItemChange = new ConfigItemChange();
            data.setConfigItemChange(configItemChange);
            List<?> cmList = baseDao.itemList("warehouse_cm_audit");
            List<?> cmList = baseDao.itemList("change_cm_audit");
            List<?> CmAuditList = cmList;
            data.setCmAuditList((List<WarehouseCmAudit>) CmAuditList);
            List<?> qaList = baseDao.itemList("warehouse_qa_audit");
            List<?> qaList = baseDao.itemList("change_qa_audit");
            List<?> QaAuditList = qaList;
            data.setQaAuditList((List<WarehouseQaAudit>) QaAuditList);
            List<?> resultList = configItemService.ConfigItemList(projectId);
            List<?> ConfigItemList = resultList;
            data.setConfigItemList((List<WarehouseConfigItem>) ConfigItemList);
        }

        if (projectId != null) {