修改

jinlin

2023-12-08 c4d808b6d41a77603ebffbd0cf599e9fa1234ab0

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

@@ -87,7 +87,7 @@
            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));
@@ -106,7 +106,7 @@
                    }else if (configItem.getItemName().equals("软件测试说明")){
                        code=code+"D";
                    }else if (configItem.getItemName().equals("软件测试记录")){
                        code=code+"L";
                        code=code+"H";
                    }else if (configItem.getItemName().equals("软件测试报告")){
                        code=code+"R";
                    }
@@ -161,33 +161,33 @@
        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);
            List<WarehouseConfigItem> ConfigItemList = configItemService.getList(changeId);
            data.setConfigItemList(ConfigItemList);

        } 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<?> resultList = configItemService.warehouseConfigList(projectId);
            List<?> ConfigItemList = resultList;
            data.setConfigItemList((List<WarehouseConfigItem>) ConfigItemList);
        }