useCompany -> usePartner 명칭 변경 * DB 초기화 필요

이민희

2021-11-26 f2ad0cefdd2fc83040a5d915a2c7dd37783f4395

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

@@ -3,9 +3,8 @@
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.constant.UsePartner;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
@@ -125,7 +124,7 @@
        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        issueType.setUseCompany(issueTypeForm.getUseCompany());
        issueType.setUsePartner(issueTypeForm.getUsePartner());

        return this.issueTypeRepository.saveAndFlush(issueType);
    }
@@ -249,17 +248,17 @@
            if (project != null) {
                issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
            }
            Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0;
            Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0;

            List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
            for (Integer useAbleCompany : UseCompany.useCompanies) {// 1 // 2 // 4
                UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(using, useAbleCompany);//3, 1 / 3, 2 / 3, 4
            List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
            for (Integer usePartner : UsePartner.partners) {// 1 // 2 // 4
                UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);//3, 1 / 3, 2 / 3, 4

                if (useCompanyVo != null) {
                    useCompanyVos.add(useCompanyVo);
                if (usePartnerVo != null) {
                    usePartnerVos.add(usePartnerVo);
                }
            }
            issueTypeVo.setUseCompanyVos(useCompanyVos);
            issueTypeVo.setUsePartnerVos(usePartnerVos);
        }

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

        issueType.setUseCompany(issueTypeForm.getUseCompany());
        issueType.setUsePartner(issueTypeForm.getUsePartner());

        /*if(issueTypeForm.getCompanyId() != null){
            CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());