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

이민희

2021-11-26 247dcf648bbceb4cc4f2fa405c1e331e9b901181

 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;
@@ -47,6 +49,15 @@

    @Autowired
    private WorkspaceService workspaceService;

    @Autowired
    private CompanyFieldService companyFieldService;

    @Autowired
    private IspFieldService ispFieldService;

    @Autowired
    private HostingFieldService hostingFieldService;

    @Autowired
    private IssueTypeMapper issueTypeMapper;
@@ -114,6 +125,8 @@
        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        issueType.setUseCompany(issueTypeForm.getUseCompany());

        return this.issueTypeRepository.saveAndFlush(issueType);
    }

@@ -172,6 +185,9 @@
        }

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

        resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
                totalPage, totalCount));
@@ -201,6 +217,18 @@
        }
    }

    /*//  이슈 유형에 연결된 업체 정보를 셋팅한다.
    private void setUseIssueTypeByCompanyField(List<IssueTypeVo> issueTypeVos) {
        for (IssueTypeVo issueTypeVo : issueTypeVos){
            IssueType issueType = this.getIssueType(issueTypeVo.getId());
            CompanyField companyField = issueType.getCompanyField();
            if(companyField != null){
                issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
            }
        }
    }
    */

    //  이슈 유형 상세 정보를 조회한다.
    @Override
    @Transactional(readOnly = true)
@@ -221,6 +249,23 @@
            if (project != null) {
                issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
            }
            Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().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

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

            /*CompanyField companyField = issueType.getCompanyField();
            if(companyField != null){
                issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
            }
            */
        }

        resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -249,6 +294,14 @@
        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        issueType.setUseCompany(issueTypeForm.getUseCompany());

        /*if(issueTypeForm.getCompanyId() != null){
            CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
            issueType.setCompanyField(companyField);
        }*/
//        issueType.setCompanyYn(issueTypeForm.getCompanyYn());

        this.issueTypeRepository.saveAndFlush(issueType);

        return issueType;