- 이슈 유형에 호스팅/업체/isp 설정 기능 추가

jhjang

2021-11-25 305de5dd5a88baf49b9939fe3233f207f3f7acf8

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

@@ -3,7 +3,9 @@
import com.google.common.collect.Lists;
import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MngPermission;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.constant.UseCompany;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
@@ -123,18 +125,7 @@
        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);
        }
        issueType.setUseCompany(issueTypeForm.getUseCompany());

        return this.issueTypeRepository.saveAndFlush(issueType);
    }
@@ -194,9 +185,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 +217,7 @@
        }
    }

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

    //  이슈 유형 상세 정보를 조회한다.
    @Override
@@ -277,8 +268,20 @@
            if (project != null) {
                issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
            }
            Integer use = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0;

            CompanyField companyField = issueType.getCompanyField();
            List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
            for (Integer useCompany : UseCompany.useCompanies) {
                UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(use, useCompany);

                if (useCompanyVo != null) {
                    useCompanyVos.add(useCompanyVo);
                }
            }

            issueTypeVo.setUseCompanyVos(useCompanyVos);

            /*CompanyField companyField = issueType.getCompanyField();
            if(companyField != null){
                issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
            }
@@ -289,7 +292,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 +321,9 @@
        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        if(issueTypeForm.getCompanyId() != null){
        issueType.setUseCompany(issueTypeForm.getUseCompany());

        /*if(issueTypeForm.getCompanyId() != null){
            CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
            issueType.setCompanyField(companyField);
        }
@@ -329,7 +334,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);