이슈상세 - 업체/ISP/호스팅 백엔드 수정

이민희

2021-11-26 247dcf648bbceb4cc4f2fa405c1e331e9b901181

이슈상세 - 업체/ISP/호스팅 백엔드 수정

 src/main/java/kr/wisestone/owl/constant/UseCompany.java

@@ -15,15 +15,14 @@
    public static String[] Names = {"업체", "ISP", "호스팅"};
    public static int[] useCompanies = {USE_COMPANY_COMPANY, USE_COMPANY_ISP, USE_COMPANY_HOSTING};

    // 권한 체크후 HostingFieldVo 가져오기
    public static UseCompanyVo checkUseCompany(int userPermission, int typePermission)
    // 업체/ISP/호스팅 정보 유무 체크 후 UseCompanyVo.Create
    public static UseCompanyVo checkUseCompany(int using, int useAbleCompany) //using - DB에 저장된 값, useAbleCompany - 각 업체들의 실제 값
    {
        if (((userPermission & typePermission) != 0)) {
        if (((using & useAbleCompany) != 0)) {
            Long Id = 0L;
            if (typePermission != USE_COMPANY_COMPANY) {
                Id = typePermission / 2L;
            if (useAbleCompany != USE_COMPANY_COMPANY) {
                Id = useAbleCompany / 2L;
            }

            return UseCompanyVo.Create(Id, Names[Id.intValue()]);
        }
        return  null;

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

@@ -6,6 +6,7 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.ElasticSearchConstants;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.constant.UseCompany;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
import kr.wisestone.owl.domain.enumType.EmailType;
@@ -865,9 +866,35 @@
        this.setIssueHistory(issue, issueVo);   //  이슈 기록 정보 셋팅
        this.setRelationIssue(issue, issueVo);        //연관 일감 셋팅
        this.setDownIssues(issue, issueVo);

        IssueType issueType = this.issueTypeService.getIssueType(issueVo.getIssueTypeVo().getId()); // 이슈의 이슈유형 객체
        Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0; // 이슈유형별로 사용중인 업체/ISP/호스팅 값

        List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
        for (Integer useAbleCompany : UseCompany.useCompanies) { //1(업체), 2(ISP), 4(호스팅)
            UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(using, useAbleCompany);

            if (useCompanyVo != null) {
                useCompanyVos.add(useCompanyVo);
                //useCompanyVo.setValues();
            }
            issueVo.setUseCompanyVo(useCompanyVos);
        }

//        List<UseCompanyVo> useCompanyVoList =issueVo.getIssueTypeVo().getUseCompanyVos();
//        for (Integer useCompany : UseCompany.useCompanies) {
//            UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(use, useCompany);
//
//            if (useCompanyVo != null) {
//                useCompanyVoList.add(useCompanyVo);
//            }
//        }

        this.setIssueCompanyField(issue, issueVo);  //업체 정보 세팅
        this.setIssueIspField(issue, issueVo);  //ISP 정보 세팅
        this.setIssueHostingField(issue, issueVo);  //HOSTING 정보 세팅


        this.setParentIssue(issue,issueVo); //상위 이슈 정보 세팅

    }

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

@@ -227,26 +227,7 @@
            }
        }
    }
    //  이슈 유형에 연결된 ISP 정보를 셋팅한다.
    private void setUseIssueTypeByIspField(List<IssueTypeVo> issueTypeVos) {
        for (IssueTypeVo issueTypeVo : issueTypeVos){
            IssueType issueType = this.getIssueType(issueTypeVo.getId());
            IspField ispField = issueType.getIspField();
            if(ispField != null){
                issueTypeVo.setIspFieldVo(ConvertUtil.copyProperties(issueType.getIspField(), IspFieldVo.class));
            }
        }
    }
    //  이슈 유형에 연결된 호스팅 정보를 셋팅한다.
    private void setUseIssueTypeByHostingField(List<IssueTypeVo> issueTypeVos) {
        for (IssueTypeVo issueTypeVo : issueTypeVos){
            IssueType issueType = this.getIssueType(issueTypeVo.getId());
            HostingField hostingField = issueType.getHostingField();
            if(hostingField != null){
                issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
            }
        }
    }*/
    */

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

            List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
            for (Integer useCompany : UseCompany.useCompanies) {
                UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(use, useCompany);
            for (Integer useAbleCompany : UseCompany.useCompanies) {// 1 // 2 // 4
                UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(using, useAbleCompany);//3, 1 / 3, 2 / 3, 4

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

            issueTypeVo.setUseCompanyVos(useCompanyVos);

            /*CompanyField companyField = issueType.getCompanyField();
            if(companyField != null){
                issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
            }
            IspField ispField = issueType.getIspField();
            if (ispField != null){
                issueTypeVo.setIspFieldVo(ConvertUtil.copyProperties(issueType.getIspField(), IspFieldVo.class));
            }
            HostingField hostingField = issueType.getHostingField();
            if (hostingField != null){
                issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
            }*/
            */
        }

        resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -326,18 +299,8 @@
        /*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.setCompanyYn(issueTypeForm.getCompanyYn());
//        issueType.setIspYn(issueTypeForm.getIspYn());
//        issueType.setHostingYn(issueTypeForm.getHostingYn());

        this.issueTypeRepository.saveAndFlush(issueType);


 src/main/java/kr/wisestone/owl/vo/IssueVo.java

@@ -54,12 +54,12 @@
    private WorkflowStatusVo workflowStatusVo;
    //private Long parentIssueId;     // 상위 일감
    private IssueVo parentIssueVo;

    private List<IssueCompanyVo> issueCompanyVos;
    private List<IssueIspVo> issueIspVos;
    private List<IssueHostingVo> issueHostingVos;

    private IssueTableConfig issueRelTableConfig;
    private IssueTableConfig issueDownTableConfig;
    private List<UseCompanyVo> useCompanyVo = Lists.newArrayList();

    public IssueVo(){}

@@ -431,19 +431,11 @@
        this.parentIssueVo = parentIssueVo;
    }

    public IssueTableConfig getIssueRelTableConfig() {
        return issueRelTableConfig;
    public List<UseCompanyVo> getUseCompanyVo() {
        return useCompanyVo;
    }

    public void setIssueRelTableConfig(IssueTableConfig issueRelTableConfig) {
        this.issueRelTableConfig = issueRelTableConfig;
    }

    public IssueTableConfig getIssueDownTableConfig() {
        return issueDownTableConfig;
    }

    public void setIssueDownTableConfig(IssueTableConfig issueDownTableConfig) {
        this.issueDownTableConfig = issueDownTableConfig;
    public void setUseCompanyVo(List<UseCompanyVo> useCompanyVo) {
        this.useCompanyVo = useCompanyVo;
    }
}