~jhpark/owl-kisa.git - maprexDevGit

부모: 58e7c16d | 패치 | 커밋 | ignore whitespace

이민희

2022-01-17 709c9fb1f42a70da66ab9b759014b009b1c67d95

충돌 병합

2개 파일 변경됨

	src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java	58 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java	63 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리

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

@@ -121,39 +121,41 @@
        if (issue != null) {
            StringBuilder sb = new StringBuilder();
            List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();

            if (issueHostingFields != null && issueHostingFields.size() > 0) {
                Map<String, Object> param = issueHostingFields.get(0);
                IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());

                if (issueHosting != null) { //수정 시
                    // 변경 이력 남기고 issueHosting에 set 해주기
                    issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    
                    issueHosting.setName(MapUtil.getString(param, "name"));
                    issueHosting.setEmail(MapUtil.getString(param, "email"));
                    issueHosting.setCode(MapUtil.getString(param, "code"));
                    issueHosting.setUrl(MapUtil.getString(param, "url"));
                    issueHosting.setManager(MapUtil.getString(param, "manager"));
                    issueHosting.setTel(MapUtil.getString(param, "tel"));
                    issueHosting.setMemo(MapUtil.getString(param, "memo"));
                    
                    this.issueHostingRepository.saveAndFlush(issueHosting);
                if (issueHostingFields != null && issueHostingFields.size() > 0) {
                    IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());

                } else { //추가 시
                    IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
                    // 추가 이력
                    issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    this.issueHostingRepository.saveAndFlush(newIssueHosting);
                    if (issueHosting != null) { //수정 시
                        // 변경 이력 남기고 issueHosting에 set 해주기
                        issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());

                        issueHosting.setName(MapUtil.getString(param, "name"));
                        issueHosting.setEmail(MapUtil.getString(param, "email"));
                        issueHosting.setCode(MapUtil.getString(param, "code"));
                        issueHosting.setUrl(MapUtil.getString(param, "url"));
                        issueHosting.setManager(MapUtil.getString(param, "manager"));
                        issueHosting.setTel(MapUtil.getString(param, "tel"));
                        issueHosting.setMemo(MapUtil.getString(param, "memo"));

                        this.issueHostingRepository.saveAndFlush(issueHosting);

                    } else { //추가 시
                        IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
                        // 추가 이력
                        issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                        this.issueHostingRepository.saveAndFlush(newIssueHosting);
                    }
                } else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
                    // 호스팅 정보 직접 추가
                    CreateHostingField(issueForm, issue);
                } else {
                    this.issueHostingRepository.deleteByIssueId(issue.getId());
                    this.issueHostingRepository.flush();
                }
            } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
                // 호스팅 정보 직접 추가
                CreateHostingField(issueForm, issue);
            } else {
                this.issueHostingRepository.deleteByIssueId(issue.getId());
                this.issueHostingRepository.flush();
            }
        }
    }

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

@@ -95,8 +95,10 @@
            IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
            issueIsp.setIspField(ispField);
        }

        return issueIsp;
    }


    /**
     *  이슈 ISP 만들기
@@ -110,6 +112,7 @@
        return CreateIssueIsp(ispFieldForm, issue);
    }


    //  이슈에서 사용되는 업체 값을 업데이트한다.
    @Override
    @Transactional
@@ -117,41 +120,43 @@
        if (issue != null) {
            StringBuilder sb = new StringBuilder();
            List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();

            if (issueIspFields != null && issueIspFields.size() > 0) {
                Map<String, Object> param = issueIspFields.get(0);
                IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());

                if (issueIsp != null) {//수정 시
                    // 변경 이력 남기고 issueIsp에 set해주기
                    issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    
                    issueIsp.setName(MapUtil.getString(param, "name"));
                    issueIsp.setEmail(MapUtil.getString(param, "email"));
                    issueIsp.setCode(MapUtil.getString(param, "code"));
                    issueIsp.setUrl(MapUtil.getString(param, "url"));
                    issueIsp.setManager(MapUtil.getString(param, "manager"));
                    issueIsp.setTel(MapUtil.getString(param, "tel"));
                    issueIsp.setMemo(MapUtil.getString(param, "memo"));
                if (issueIspFields != null && issueIspFields.size() > 0) {
                    IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());

                    this.issueIspRepository.saveAndFlush(issueIsp);
                    if (issueIsp != null) {//수정 시
                        // 변경 이력 남기고 issueIsp에 set해주기
                        issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());

                } else { //추가 시
                    IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
                    // 추가 이력
                    issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    this.issueIspRepository.saveAndFlush(newIssueIsp);
                        issueIsp.setName(MapUtil.getString(param, "name"));
                        issueIsp.setEmail(MapUtil.getString(param, "email"));
                        issueIsp.setCode(MapUtil.getString(param, "code"));
                        issueIsp.setUrl(MapUtil.getString(param, "url"));
                        issueIsp.setManager(MapUtil.getString(param, "manager"));
                        issueIsp.setTel(MapUtil.getString(param, "tel"));
                        issueIsp.setMemo(MapUtil.getString(param, "memo"));

                        this.issueIspRepository.saveAndFlush(issueIsp);

                    } else { //추가 시
                        IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
                        // 추가 이력
                        issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                        this.issueIspRepository.saveAndFlush(newIssueIsp);
                    }
                }
            }
            // 사용자가 직접 입력시
            else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
                //ISP정보 직접 추가
                CreateIspField(issueForm, issue);
            } else {
                this.issueIspRepository.deleteByIssueId(issue.getId());
                this.issueIspRepository.flush();
                // 사용자가 직접 입력시
                else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
                    //ISP정보 직접 추가
                    CreateIspField(issueForm, issue);
                } else {
                    this.issueIspRepository.deleteByIssueId(issue.getId());
                    this.issueIspRepository.flush();
                }
            }
        }
    }

			@@ -121,39 +121,41 @@
			if (issue != null) {
			StringBuilder sb = new StringBuilder();
			List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();

			if (issueHostingFields != null && issueHostingFields.size() > 0) {
			Map<String, Object> param = issueHostingFields.get(0);
			IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());

			if (issueHosting != null) { //수정 시
			// 변경 이력 남기고 issueHosting에 set 해주기
			issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());

			issueHosting.setName(MapUtil.getString(param, "name"));
			issueHosting.setEmail(MapUtil.getString(param, "email"));
			issueHosting.setCode(MapUtil.getString(param, "code"));
			issueHosting.setUrl(MapUtil.getString(param, "url"));
			issueHosting.setManager(MapUtil.getString(param, "manager"));
			issueHosting.setTel(MapUtil.getString(param, "tel"));
			issueHosting.setMemo(MapUtil.getString(param, "memo"));

			this.issueHostingRepository.saveAndFlush(issueHosting);
			if (issueHostingFields != null && issueHostingFields.size() > 0) {
			IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());

			} else { //추가 시
			IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
			// 추가 이력
			issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
			this.issueHostingRepository.saveAndFlush(newIssueHosting);
			if (issueHosting != null) { //수정 시
			// 변경 이력 남기고 issueHosting에 set 해주기
			issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());

			issueHosting.setName(MapUtil.getString(param, "name"));
			issueHosting.setEmail(MapUtil.getString(param, "email"));
			issueHosting.setCode(MapUtil.getString(param, "code"));
			issueHosting.setUrl(MapUtil.getString(param, "url"));
			issueHosting.setManager(MapUtil.getString(param, "manager"));
			issueHosting.setTel(MapUtil.getString(param, "tel"));
			issueHosting.setMemo(MapUtil.getString(param, "memo"));

			this.issueHostingRepository.saveAndFlush(issueHosting);

			} else { //추가 시
			IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
			// 추가 이력
			issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
			this.issueHostingRepository.saveAndFlush(newIssueHosting);
			}
			} else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
			// 호스팅 정보 직접 추가
			CreateHostingField(issueForm, issue);
			} else {
			this.issueHostingRepository.deleteByIssueId(issue.getId());
			this.issueHostingRepository.flush();
			}
			} else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
			// 호스팅 정보 직접 추가
			CreateHostingField(issueForm, issue);
			} else {
			this.issueHostingRepository.deleteByIssueId(issue.getId());
			this.issueHostingRepository.flush();
			}
			}
			}

			@@ -95,8 +95,10 @@
			IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
			issueIsp.setIspField(ispField);
			}

			return issueIsp;
			}


			/**
			* 이슈 ISP 만들기
			@@ -110,6 +112,7 @@
			return CreateIssueIsp(ispFieldForm, issue);
			}


			// 이슈에서 사용되는 업체 값을 업데이트한다.
			@Override
			@Transactional
			@@ -117,41 +120,43 @@
			if (issue != null) {
			StringBuilder sb = new StringBuilder();
			List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();

			if (issueIspFields != null && issueIspFields.size() > 0) {
			Map<String, Object> param = issueIspFields.get(0);
			IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());

			if (issueIsp != null) {//수정 시
			// 변경 이력 남기고 issueIsp에 set해주기
			issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());

			issueIsp.setName(MapUtil.getString(param, "name"));
			issueIsp.setEmail(MapUtil.getString(param, "email"));
			issueIsp.setCode(MapUtil.getString(param, "code"));
			issueIsp.setUrl(MapUtil.getString(param, "url"));
			issueIsp.setManager(MapUtil.getString(param, "manager"));
			issueIsp.setTel(MapUtil.getString(param, "tel"));
			issueIsp.setMemo(MapUtil.getString(param, "memo"));
			if (issueIspFields != null && issueIspFields.size() > 0) {
			IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());

			this.issueIspRepository.saveAndFlush(issueIsp);
			if (issueIsp != null) {//수정 시
			// 변경 이력 남기고 issueIsp에 set해주기
			issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());

			} else { //추가 시
			IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
			// 추가 이력
			issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
			this.issueIspRepository.saveAndFlush(newIssueIsp);
			issueIsp.setName(MapUtil.getString(param, "name"));
			issueIsp.setEmail(MapUtil.getString(param, "email"));
			issueIsp.setCode(MapUtil.getString(param, "code"));
			issueIsp.setUrl(MapUtil.getString(param, "url"));
			issueIsp.setManager(MapUtil.getString(param, "manager"));
			issueIsp.setTel(MapUtil.getString(param, "tel"));
			issueIsp.setMemo(MapUtil.getString(param, "memo"));

			this.issueIspRepository.saveAndFlush(issueIsp);

			} else { //추가 시
			IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
			// 추가 이력
			issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
			this.issueIspRepository.saveAndFlush(newIssueIsp);
			}
			}
			}
			// 사용자가 직접 입력시
			else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
			//ISP정보 직접 추가
			CreateIspField(issueForm, issue);
			} else {
			this.issueIspRepository.deleteByIssueId(issue.getId());
			this.issueIspRepository.flush();
			// 사용자가 직접 입력시
			else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
			//ISP정보 직접 추가
			CreateIspField(issueForm, issue);
			} else {
			this.issueIspRepository.deleteByIssueId(issue.getId());
			this.issueIspRepository.flush();
			}
			}
			}
			}