이슈유형 - 업체,isp,호스팅 정보 Y/N 으로 변경

이민희

2021-11-25 be5e72136e63e4d3513c4c66979fad8e0109c42d

 src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java

@@ -123,19 +123,18 @@
        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        if(issueTypeForm.getCompanyId() != null){
            CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
            issueType.setCompanyField(companyField);
        }
        if(issueTypeForm.getIspId() != null){
            IspField ispField = this.ispFieldService.getIsp(issueTypeForm.getIspId());
            issueType.setIspField(ispField);
        }
        if(issueTypeForm.getHostingId() != null){
            HostingField hostingField = this.hostingFieldService.getHosting(issueTypeForm.getHostingId());
            issueType.setHostingField(hostingField);
        }
        String Yes = "Y";
        String No = "N";

        if(!issueTypeForm.getCompanyYn().equals(No)){
            issueType.setCompanyYn(Yes);
        }
        if(!issueTypeForm.getHostingYn().equals(No)){
            issueType.setHostingYn(Yes);
        }
        if(!issueTypeForm.getIspYn().equals(No)){
            issueType.setIspYn(Yes);
        }
        return this.issueTypeRepository.saveAndFlush(issueType);
    }

@@ -194,9 +193,9 @@
        }

        this.setUseIssueTypeByProject(issueTypeVos);
        this.setUseIssueTypeByCompanyField(issueTypeVos);
        /*this.setUseIssueTypeByCompanyField(issueTypeVos);
        this.setUseIssueTypeByIspField(issueTypeVos);
        this.setUseIssueTypeByHostingField(issueTypeVos);
        this.setUseIssueTypeByHostingField(issueTypeVos);*/

        resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
                totalPage, totalCount));
@@ -226,7 +225,7 @@
        }
    }

    //  이슈 유형에 연결된 업체 정보를 셋팅한다.
    /*//  이슈 유형에 연결된 업체 정보를 셋팅한다.
    private void setUseIssueTypeByCompanyField(List<IssueTypeVo> issueTypeVos) {
        for (IssueTypeVo issueTypeVo : issueTypeVos){
            IssueType issueType = this.getIssueType(issueTypeVo.getId());
@@ -255,7 +254,7 @@
                issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
            }
        }
    }
    }*/

    //  이슈 유형 상세 정보를 조회한다.
    @Override
@@ -278,7 +277,7 @@
                issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
            }

            CompanyField companyField = issueType.getCompanyField();
            /*CompanyField companyField = issueType.getCompanyField();
            if(companyField != null){
                issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
            }
@@ -289,7 +288,7 @@
            HostingField hostingField = issueType.getHostingField();
            if (hostingField != null){
                issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
            }
            }*/
        }

        resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -318,7 +317,7 @@
        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        if(issueTypeForm.getCompanyId() != null){
        /*if(issueTypeForm.getCompanyId() != null){
            CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
            issueType.setCompanyField(companyField);
        }
@@ -329,7 +328,10 @@
        if(issueTypeForm.getHostingId() != null) {
            HostingField hostingField = this.hostingFieldService.getHosting(issueTypeForm.getHostingId());
            issueType.setHostingField(hostingField);
        }
        }*/
        issueType.setCompanyYn(issueTypeForm.getCompanyYn());
        issueType.setIspYn(issueTypeForm.getIspYn());
        issueType.setHostingYn(issueTypeForm.getHostingYn());

        this.issueTypeRepository.saveAndFlush(issueType);