~jhpark/owl-kisa.git - maprexDevGit

부모: 2473c035 | 패치 | 커밋 | show whitespace

이민희

2021-11-25 be5e72136e63e4d3513c4c66979fad8e0109c42d

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

5개 파일 변경됨

	src/main/java/kr/wisestone/owl/domain/IssueType.java	35 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java	42 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java	30 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java	30 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/resources/migration/V1_11__Alter_Table.sql	8 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리

 src/main/java/kr/wisestone/owl/domain/IssueType.java

@@ -18,6 +18,9 @@
    private String name;
    private String description;
    private String color;
    private String companyYn;
    private String ispYn;
    private String hostingYn;

    @ManyToOne(fetch = FetchType.LAZY)
    @JoinColumn(name = "workspace_id")
@@ -31,7 +34,7 @@
    @JoinColumn(name = "project_id")
    private Project project;

    @ManyToOne(fetch = FetchType.LAZY)
    /*@ManyToOne(fetch = FetchType.LAZY)
    @JoinColumn(name = "company_id")
    private CompanyField companyField;

@@ -41,7 +44,7 @@

    @ManyToOne(fetch = FetchType.LAZY)
    @JoinColumn(name = "hosting_id")
    private HostingField hostingField;
    private HostingField hostingField;*/

    @OneToMany(mappedBy = "issueType", cascade = { CascadeType.ALL }, orphanRemoval = true)
    private Set<IssueTypeCustomField> issueTypeCustomFields = new HashSet<>();
@@ -121,7 +124,31 @@
        this.project = project;
    }

    public CompanyField getCompanyField() {
    public String getCompanyYn() {
        return companyYn;
    }

    public void setCompanyYn(String companyYn) {
        this.companyYn = companyYn;
    }

    public String getIspYn() {
        return ispYn;
    }

    public void setIspYn(String ispYn) {
        this.ispYn = ispYn;
    }

    public String getHostingYn() {
        return hostingYn;
    }

    public void setHostingYn(String hostingYn) {
        this.hostingYn = hostingYn;
    }

    /* public CompanyField getCompanyField() {
        return companyField;
    }

@@ -143,5 +170,5 @@

    public void setHostingField(HostingField hostingField) {
        this.hostingField = hostingField;
    }
    }*/
}

 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);


 src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java

@@ -18,9 +18,9 @@
    private String deep;    //  상세 조회에서 가져올 데이터의 종류를 결정한다.
    private boolean UseProject = false;     // 프로젝트에서 사용중인 이슈타입을 가져올때 사용

    private Long companyId;
    private Long ispId;
    private Long hostingId;
    private String companyYn;
    private String ispYn;
    private String hostingYn;

    public IssueTypeCondition(){}

@@ -96,27 +96,27 @@
        UseProject = useProject;
    }

    public Long getCompanyId() {
        return companyId;
    public String getCompanyYn() {
        return companyYn;
    }

    public void setCompanyId(Long companyId) {
        this.companyId = companyId;
    public void setCompanyYn(String companyYn) {
        this.companyYn = companyYn;
    }

    public Long getIspId() {
        return ispId;
    public String getIspYn() {
        return ispYn;
    }

    public void setIspId(Long ispId) {
        this.ispId = ispId;
    public void setIspYn(String ispYn) {
        this.ispYn = ispYn;
    }

    public Long getHostingId() {
        return hostingId;
    public String getHostingYn() {
        return hostingYn;
    }

    public void setHostingId(Long hostingId) {
        this.hostingId = hostingId;
    public void setHostingYn(String hostingYn) {
        this.hostingYn = hostingYn;
    }
}

 src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java

@@ -17,9 +17,9 @@
    private String color;
    private Long workflowId;
    private Long projectId;
    private Long companyId;
    private Long ispId;
    private Long hostingId;
    private String companyYn;
    private String ispYn;
    private String hostingYn;
    private List<Long> removeIds = Lists.newArrayList();

    public IssueTypeForm(){}
@@ -94,27 +94,27 @@
        this.projectId = projectId;
    }

    public Long getCompanyId() {
        return companyId;
    public String getCompanyYn() {
        return companyYn;
    }

    public void setCompanyId(Long companyId) {
        this.companyId = companyId;
    public void setCompanyYn(String companyYn) {
        this.companyYn = companyYn;
    }

    public Long getIspId() {
        return ispId;
    public String getIspYn() {
        return ispYn;
    }

    public void setIspId(Long ispId) {
        this.ispId = ispId;
    public void setIspYn(String ispYn) {
        this.ispYn = ispYn;
    }

    public Long getHostingId() {
        return hostingId;
    public String getHostingYn() {
        return hostingYn;
    }

    public void setHostingId(Long hostingId) {
        this.hostingId = hostingId;
    public void setHostingYn(String hostingYn) {
        this.hostingYn = hostingYn;
    }
}

 src/main/resources/migration/V1_11__Alter_Table.sql

@@ -207,7 +207,7 @@
                                      INDEX `departmentIdIndex` (`department_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- issue_type 테이블 업체,ISP,호스팅 ID 컬럼 추가
ALTER TABLE `issue_type` ADD COLUMN  `company_id` BIGINT(20) NULL;
ALTER TABLE `issue_type` ADD COLUMN  `isp_id` BIGINT(20) NULL;
ALTER TABLE `issue_type` ADD COLUMN  `hosting_id` BIGINT(20) NULL;
-- issue_type 테이블 업체,ISP,호스팅 컬럼 추가
ALTER TABLE `issue_type` ADD COLUMN  `company_yn` VARCHAR(1) NOT NULL DEFAULT 'N';
ALTER TABLE `issue_type` ADD COLUMN  `isp_yn` VARCHAR(1) NOT NULL DEFAULT 'N';
ALTER TABLE `issue_type` ADD COLUMN  `hosting_yn` VARCHAR(1) NOT NULL DEFAULT 'N';

			@@ -18,6 +18,9 @@
			private String name;
			private String description;
			private String color;
			private String companyYn;
			private String ispYn;
			private String hostingYn;

			@ManyToOne(fetch = FetchType.LAZY)
			@JoinColumn(name = "workspace_id")
			@@ -31,7 +34,7 @@
			@JoinColumn(name = "project_id")
			private Project project;

			@ManyToOne(fetch = FetchType.LAZY)
			/*@ManyToOne(fetch = FetchType.LAZY)
			@JoinColumn(name = "company_id")
			private CompanyField companyField;

			@@ -41,7 +44,7 @@

			@ManyToOne(fetch = FetchType.LAZY)
			@JoinColumn(name = "hosting_id")
			private HostingField hostingField;
			private HostingField hostingField;*/

			@OneToMany(mappedBy = "issueType", cascade = { CascadeType.ALL }, orphanRemoval = true)
			private Set<IssueTypeCustomField> issueTypeCustomFields = new HashSet<>();
			@@ -121,7 +124,31 @@
			this.project = project;
			}

			public CompanyField getCompanyField() {
			public String getCompanyYn() {
			return companyYn;
			}

			public void setCompanyYn(String companyYn) {
			this.companyYn = companyYn;
			}

			public String getIspYn() {
			return ispYn;
			}

			public void setIspYn(String ispYn) {
			this.ispYn = ispYn;
			}

			public String getHostingYn() {
			return hostingYn;
			}

			public void setHostingYn(String hostingYn) {
			this.hostingYn = hostingYn;
			}

			/* public CompanyField getCompanyField() {
			return companyField;
			}

			@@ -143,5 +170,5 @@

			public void setHostingField(HostingField hostingField) {
			this.hostingField = hostingField;
			}
			}*/
			}

			@@ -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);

			@@ -18,9 +18,9 @@
			private String deep; // 상세 조회에서 가져올 데이터의 종류를 결정한다.
			private boolean UseProject = false; // 프로젝트에서 사용중인 이슈타입을 가져올때 사용

			private Long companyId;
			private Long ispId;
			private Long hostingId;
			private String companyYn;
			private String ispYn;
			private String hostingYn;

			public IssueTypeCondition(){}

			@@ -96,27 +96,27 @@
			UseProject = useProject;
			}

			public Long getCompanyId() {
			return companyId;
			public String getCompanyYn() {
			return companyYn;
			}

			public void setCompanyId(Long companyId) {
			this.companyId = companyId;
			public void setCompanyYn(String companyYn) {
			this.companyYn = companyYn;
			}

			public Long getIspId() {
			return ispId;
			public String getIspYn() {
			return ispYn;
			}

			public void setIspId(Long ispId) {
			this.ispId = ispId;
			public void setIspYn(String ispYn) {
			this.ispYn = ispYn;
			}

			public Long getHostingId() {
			return hostingId;
			public String getHostingYn() {
			return hostingYn;
			}

			public void setHostingId(Long hostingId) {
			this.hostingId = hostingId;
			public void setHostingYn(String hostingYn) {
			this.hostingYn = hostingYn;
			}
			}

			@@ -17,9 +17,9 @@
			private String color;
			private Long workflowId;
			private Long projectId;
			private Long companyId;
			private Long ispId;
			private Long hostingId;
			private String companyYn;
			private String ispYn;
			private String hostingYn;
			private List<Long> removeIds = Lists.newArrayList();

			public IssueTypeForm(){}
			@@ -94,27 +94,27 @@
			this.projectId = projectId;
			}

			public Long getCompanyId() {
			return companyId;
			public String getCompanyYn() {
			return companyYn;
			}

			public void setCompanyId(Long companyId) {
			this.companyId = companyId;
			public void setCompanyYn(String companyYn) {
			this.companyYn = companyYn;
			}

			public Long getIspId() {
			return ispId;
			public String getIspYn() {
			return ispYn;
			}

			public void setIspId(Long ispId) {
			this.ispId = ispId;
			public void setIspYn(String ispYn) {
			this.ispYn = ispYn;
			}

			public Long getHostingId() {
			return hostingId;
			public String getHostingYn() {
			return hostingYn;
			}

			public void setHostingId(Long hostingId) {
			this.hostingId = hostingId;
			public void setHostingYn(String hostingYn) {
			this.hostingYn = hostingYn;
			}
			}

			@@ -207,7 +207,7 @@
			INDEX `departmentIdIndex` (`department_id`) USING BTREE
			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

			-- issue_type 테이블 업체,ISP,호스팅 ID 컬럼 추가
			ALTER TABLE `issue_type` ADD COLUMN `company_id` BIGINT(20) NULL;
			ALTER TABLE `issue_type` ADD COLUMN `isp_id` BIGINT(20) NULL;
			ALTER TABLE `issue_type` ADD COLUMN `hosting_id` BIGINT(20) NULL;
			-- issue_type 테이블 업체,ISP,호스팅 컬럼 추가
			ALTER TABLE `issue_type` ADD COLUMN `company_yn` VARCHAR(1) NOT NULL DEFAULT 'N';
			ALTER TABLE `issue_type` ADD COLUMN `isp_yn` VARCHAR(1) NOT NULL DEFAULT 'N';
			ALTER TABLE `issue_type` ADD COLUMN `hosting_yn` VARCHAR(1) NOT NULL DEFAULT 'N';