~jhpark/owl-kisa.git - maprexDevGit

부모: 3ecaff54 | 패치 | 커밋 | ignore whitespace

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

wyu

2021-12-20 5d86919587d0f76f26be550c1023628a9d0caa5d

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

9개 파일 변경됨

	src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java	10 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java	11 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java	11 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueAdd.controller.js	18 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueAddDown.controller.js	53 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueAddRelation.controller.js	53 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueDetail.controller.js	29 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueModify.controller.js	52 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/views/issue/issueDetail.html	5 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리

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

@@ -47,7 +47,7 @@
            if (issueCompanyFields != null && issueCompanyFields.size() > 0) {
                Map<String, Object> param = issueCompanyFields.get(0);

                if (param != null) {
                if (param != null && param.get("companyId") != null  && param.get("companyId") != "") {
                    CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId")); //companyId 가져오기

                    Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
@@ -62,20 +62,24 @@
                        issueCompany.setCompanyField(companyField);
                        issueCompany.setName(MapUtil.getString(param, "name"));
                        issueCompany.setEmail(MapUtil.getString(param, "email"));
                        issueCompany.setUrl(MapUtil.getString(param, "url"));
                        issueCompany.setManager(MapUtil.getString(param, "manager"));
                        issueCompany.setTel(MapUtil.getString(param, "tel"));
                        issueCompany.setMemo(MapUtil.getString(param, "memo"));
                    } else  { //추가 할 경우
                        issueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
                        issueCompany.setIssue(issue);
                        issueCompany.setCompanyField(companyField);
                        if (companyField != null) {
                            issueCompany.setCompanyField(companyField);
                        }
                        // 추가 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, param, issueCompany, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    }
                    this.issueCompanyRepository.saveAndFlush(issueCompany);

                } else {
                    this.issueCompanyRepository.deleteById(MapUtil.getLong(param, "id"));
                }
            }
        }

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

@@ -49,11 +49,11 @@
            if (issueIspFields != null && issueIspFields.size() > 0) {
                Map<String, Object> param = issueIspFields.get(0);

                if (param != null) {
                if (param != null && param.get("hostingId") != null  && param.get("hostingId") != "") {
                    HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));

                    Set<IssueHosting> issueHostings = issue.getIssueHostingFields();
                    IssueHosting issueHosting = null;
                    IssueHosting issueHosting = new IssueHosting();

                    if (issueHostings != null && issueHostings.size() >0){//수정 할 경우
                        issueHosting = issueHostings.iterator().next();
@@ -66,19 +66,24 @@
                        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"));
                    }else{//추가 할 경우
                        issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
                        issueHosting.setIssue(issue);
                        issueHosting.setHostingField(hostingField);
                        if (hostingField != null) {
                            issueHosting.setHostingField(hostingField);
                        }
                        // 추가 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, issueHosting, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    }
                    this.issueHostingRepository.saveAndFlush(issueHosting);
                }else {
                    this.issueHostingRepository.deleteById(MapUtil.getLong(param, "id"));
                }
            }
        }

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

@@ -47,11 +47,11 @@
            if (issueIspFields != null && issueIspFields.size() > 0) {
                Map<String, Object> param = issueIspFields.get(0);

                if (param != null) {
                if (param != null && param.get("ispId") != null  && param.get("ispId") != "") {
                    IspField ispField = this.ispFieldService.getIsp(MapUtil.getLong(param, "ispId"));

                    Set<IssueIsp> issueIsps = issue.getIssueIspFields();
                    IssueIsp issueIsp = null;
                    IssueIsp issueIsp = new IssueIsp();

                    if (issueIsps != null && issueIsps.size() > 0) {//수정 할 경우
                        issueIsp = issueIsps.iterator().next();
@@ -64,19 +64,24 @@
                        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"));
                    } else  {//추가 할 경우
                        issueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
                        issueIsp.setIssue(issue);
                        issueIsp.setIspField(ispField);
                        if (ispField != null) {
                            issueIsp.setIspField(ispField);
                        }
                        // 추가 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, issueIsp, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    }
                    this.issueIspRepository.saveAndFlush(issueIsp);
                }else {
                    this.issueIspRepository.deleteById(MapUtil.getLong(param, "id"));
                }
            }
        }

 src/main/webapp/scripts/app/issue/issueAdd.controller.js

@@ -399,6 +399,24 @@
                    $scope.vm.companyUrl = result[0].url;
                    $scope.vm.companyMemo = result[0].memo;

                    $scope.vm.ispId = "";
                    $scope.vm.ispName = "";
                    $scope.vm.ispCode = "";
                    $scope.vm.ispManager = "";
                    $scope.vm.ispTel = "";
                    $scope.vm.ispEmail = "";
                    $scope.vm.ispUrl = "";
                    $scope.vm.ispMemo = "";

                    $scope.vm.hostingId = "";
                    $scope.vm.hostingName = "";
                    $scope.vm.hostingCode = "";
                    $scope.vm.hostingManager = "";
                    $scope.vm.hostingTel = "";
                    $scope.vm.hostingEmail = "";
                    $scope.vm.hostingUrl = "";
                    $scope.vm.hostingMemo = "";

                    if (ispFieldVo != null){
                        $scope.vm.ispId = ispFieldVo.id;
                        $scope.vm.ispName = ispFieldVo.name;

 src/main/webapp/scripts/app/issue/issueAddDown.controller.js

@@ -394,23 +394,44 @@
                    $scope.vm.companyUrl = result[0].url;
                    $scope.vm.companyMemo = result[0].memo;

                    $scope.vm.ispId = ispFieldVo.id;
                    $scope.vm.ispName = ispFieldVo.name;
                    $scope.vm.ispCode = ispFieldVo.code;
                    $scope.vm.ispManager = ispFieldVo.manager;
                    $scope.vm.ispTel = ispFieldVo.tel;
                    $scope.vm.ispEmail = ispFieldVo.email;
                    $scope.vm.ispUrl = ispFieldVo.url;
                    $scope.vm.ispMemo = ispFieldVo.memo;
                    $scope.vm.ispId = "";
                    $scope.vm.ispName = "";
                    $scope.vm.ispCode = "";
                    $scope.vm.ispManager = "";
                    $scope.vm.ispTel = "";
                    $scope.vm.ispEmail = "";
                    $scope.vm.ispUrl = "";
                    $scope.vm.ispMemo = "";

                    $scope.vm.hostingId = hostingFieldVo.id;
                    $scope.vm.hostingName = hostingFieldVo.name;
                    $scope.vm.hostingCode = hostingFieldVo.code;
                    $scope.vm.hostingManager = hostingFieldVo.manager;
                    $scope.vm.hostingTel = hostingFieldVo.tel;
                    $scope.vm.hostingEmail = hostingFieldVo.email;
                    $scope.vm.hostingUrl = hostingFieldVo.url;
                    $scope.vm.hostingMemo = hostingFieldVo.memo;
                    $scope.vm.hostingId = "";
                    $scope.vm.hostingName = "";
                    $scope.vm.hostingCode = "";
                    $scope.vm.hostingManager = "";
                    $scope.vm.hostingTel = "";
                    $scope.vm.hostingEmail = "";
                    $scope.vm.hostingUrl = "";
                    $scope.vm.hostingMemo = "";

                    if (ispFieldVo != null){
                        $scope.vm.ispId = ispFieldVo.id;
                        $scope.vm.ispName = ispFieldVo.name;
                        $scope.vm.ispCode = ispFieldVo.code;
                        $scope.vm.ispManager = ispFieldVo.manager;
                        $scope.vm.ispTel = ispFieldVo.tel;
                        $scope.vm.ispEmail = ispFieldVo.email;
                        $scope.vm.ispUrl = ispFieldVo.url;
                        $scope.vm.ispMemo = ispFieldVo.memo;
                    }
                    if (hostingFieldVo != null){
                        $scope.vm.hostingId = hostingFieldVo.id;
                        $scope.vm.hostingName = hostingFieldVo.name;
                        $scope.vm.hostingCode = hostingFieldVo.code;
                        $scope.vm.hostingManager = hostingFieldVo.manager;
                        $scope.vm.hostingTel = hostingFieldVo.tel;
                        $scope.vm.hostingEmail = hostingFieldVo.email;
                        $scope.vm.hostingUrl = hostingFieldVo.url;
                        $scope.vm.hostingMemo = hostingFieldVo.memo;
                    }
                });

                // ISP정보 결과 값 Event 처리(set)

 src/main/webapp/scripts/app/issue/issueAddRelation.controller.js

@@ -406,23 +406,44 @@
                    $scope.vm.companyUrl = result[0].url;
                    $scope.vm.companyMemo = result[0].memo;

                    $scope.vm.ispId = ispFieldVo.id;
                    $scope.vm.ispName = ispFieldVo.name;
                    $scope.vm.ispCode = ispFieldVo.code;
                    $scope.vm.ispManager = ispFieldVo.manager;
                    $scope.vm.ispTel = ispFieldVo.tel;
                    $scope.vm.ispEmail = ispFieldVo.email;
                    $scope.vm.ispUrl = ispFieldVo.url;
                    $scope.vm.ispMemo = ispFieldVo.memo;
                    $scope.vm.ispId = "";
                    $scope.vm.ispName = "";
                    $scope.vm.ispCode = "";
                    $scope.vm.ispManager = "";
                    $scope.vm.ispTel = "";
                    $scope.vm.ispEmail = "";
                    $scope.vm.ispUrl = "";
                    $scope.vm.ispMemo = "";

                    $scope.vm.hostingId = hostingFieldVo.id;
                    $scope.vm.hostingName = hostingFieldVo.name;
                    $scope.vm.hostingCode = hostingFieldVo.code;
                    $scope.vm.hostingManager = hostingFieldVo.manager;
                    $scope.vm.hostingTel = hostingFieldVo.tel;
                    $scope.vm.hostingEmail = hostingFieldVo.email;
                    $scope.vm.hostingUrl = hostingFieldVo.url;
                    $scope.vm.hostingMemo = hostingFieldVo.memo;
                    $scope.vm.hostingId = "";
                    $scope.vm.hostingName = "";
                    $scope.vm.hostingCode = "";
                    $scope.vm.hostingManager = "";
                    $scope.vm.hostingTel = "";
                    $scope.vm.hostingEmail = "";
                    $scope.vm.hostingUrl = "";
                    $scope.vm.hostingMemo = "";

                    if (ispFieldVo != null){
                        $scope.vm.ispId = ispFieldVo.id;
                        $scope.vm.ispName = ispFieldVo.name;
                        $scope.vm.ispCode = ispFieldVo.code;
                        $scope.vm.ispManager = ispFieldVo.manager;
                        $scope.vm.ispTel = ispFieldVo.tel;
                        $scope.vm.ispEmail = ispFieldVo.email;
                        $scope.vm.ispUrl = ispFieldVo.url;
                        $scope.vm.ispMemo = ispFieldVo.memo;
                    }
                    if (hostingFieldVo != null){
                        $scope.vm.hostingId = hostingFieldVo.id;
                        $scope.vm.hostingName = hostingFieldVo.name;
                        $scope.vm.hostingCode = hostingFieldVo.code;
                        $scope.vm.hostingManager = hostingFieldVo.manager;
                        $scope.vm.hostingTel = hostingFieldVo.tel;
                        $scope.vm.hostingEmail = hostingFieldVo.email;
                        $scope.vm.hostingUrl = hostingFieldVo.url;
                        $scope.vm.hostingMemo = hostingFieldVo.memo;
                    }
                });

                // ISP정보 결과 값 Event 처리(set)

 src/main/webapp/scripts/app/issue/issueDetail.controller.js

@@ -55,7 +55,7 @@
                //  이슈 목록 컨트롤러 vm, fn 상속 중
                $scope.vm.viewer = {};      // 현재 이슈
                $scope.vm.images = [];  //  첨부된 파일 중 이미지 파일
                $scope.vm.activeTab = "ALL";    //  활동 내역 탭
                $scope.vm.activeTab = "RECODE";    //  활동 내역 탭
                //  이슈 상태 변경 표시 여부
                $scope.vm.editor = {
                    issueStatus : false
@@ -1000,16 +1000,24 @@
                        $scope.vm.viewer.activeParentHistory = "";
                        $scope.vm.viewer.activeDownHistory = "";
                        $scope.vm.viewer.activeDownAllHistory = "";
                        $scope.vm.viewer.downComment = "";
                        var downTitle = "";
                        var oriDownHistory = [];
                        var oriDownCommentHistory = [];

                        // 하위이슈 히스토리
                        for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++){
                            if($scope.vm.viewer.issueDownVos.length > 1){
                                $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos.concat($scope.vm.viewer.issueDownVos[i+1].issueHistoryVos);
                                i++;
                            }else {
                                $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos;
                            oriDownHistory.push($scope.vm.viewer.issueDownVos[i].issueHistoryVos);
                            oriDownCommentHistory.push($scope.vm.viewer.issueDownVos[i].issueCommentVos);
                        }
                        for (var i=0; i<oriDownHistory.length; i++){
                            if ($scope.vm.viewer.activeDownHistory === "") {
                                $scope.vm.viewer.activeDownHistory = oriDownHistory[i];
                            } else {
                                $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.activeDownHistory.concat(oriDownHistory[i]);
                            }
                        }

                        for (var i=0; i<$scope.vm.viewer.activeDownHistory.length; i++){
                            downTitle = "<div class='dot' style='margin-bottom: -8px'>*하위이슈 : "+$scope.vm.viewer.activeDownHistory[i].title+"</div>";
                            $scope.vm.viewer.activeDownHistory[i].desc = downTitle + $scope.vm.viewer.activeDownHistory[i].description;
@@ -1019,12 +1027,11 @@
                        });

                        // 하위이슈 댓글 히스토리
                       for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++) {
                           if($scope.vm.viewer.issueDownVos.length > 1){
                                $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos.concat($scope.vm.viewer.issueDownVos[i+1].issueCommentVos);
                                i++;
                       for (var i=0; i<oriDownCommentHistory.length; i++) {
                           if ($scope.vm.viewer.downComment === "") {
                               $scope.vm.viewer.downComment = oriDownCommentHistory[i];
                           } else {
                                $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos;
                               $scope.vm.viewer.downComment = $scope.vm.viewer.downComment.concat(oriDownCommentHistory[i]);
                           }
                       }
                       $scope.vm.viewer.issueDownVos.sort(function (a, b) {   //내림차순

 src/main/webapp/scripts/app/issue/issueModify.controller.js

@@ -382,24 +382,44 @@
                    $scope.vm.companyUrl = result[0].url;
                    $scope.vm.companyMemo = result[0].memo;

                    $scope.vm.ispId = ispFieldVo.id;
                    $scope.vm.ispName = ispFieldVo.name;
                    $scope.vm.ispCode = ispFieldVo.code;
                    $scope.vm.ispManager = ispFieldVo.manager;
                    $scope.vm.ispTel = ispFieldVo.tel;
                    $scope.vm.ispEmail = ispFieldVo.email;
                    $scope.vm.ispUrl = ispFieldVo.url;
                    $scope.vm.ispMemo = ispFieldVo.memo;
                    $scope.vm.ispId = "";
                    $scope.vm.ispName = "";
                    $scope.vm.ispCode = "";
                    $scope.vm.ispManager = "";
                    $scope.vm.ispTel = "";
                    $scope.vm.ispEmail = "";
                    $scope.vm.ispUrl = "";
                    $scope.vm.ispMemo = "";

                    $scope.vm.hostingId = hostingFieldVo.id;
                    $scope.vm.hostingName = hostingFieldVo.name;
                    $scope.vm.hostingCode = hostingFieldVo.code;
                    $scope.vm.hostingManager = hostingFieldVo.manager;
                    $scope.vm.hostingTel = hostingFieldVo.tel;
                    $scope.vm.hostingEmail = hostingFieldVo.email;
                    $scope.vm.hostingUrl = hostingFieldVo.url;
                    $scope.vm.hostingMemo = hostingFieldVo.memo;
                    $scope.vm.hostingId = "";
                    $scope.vm.hostingName = "";
                    $scope.vm.hostingCode = "";
                    $scope.vm.hostingManager = "";
                    $scope.vm.hostingTel = "";
                    $scope.vm.hostingEmail = "";
                    $scope.vm.hostingUrl = "";
                    $scope.vm.hostingMemo = "";

                    if (ispFieldVo != null){
                        $scope.vm.ispId = ispFieldVo.id;
                        $scope.vm.ispName = ispFieldVo.name;
                        $scope.vm.ispCode = ispFieldVo.code;
                        $scope.vm.ispManager = ispFieldVo.manager;
                        $scope.vm.ispTel = ispFieldVo.tel;
                        $scope.vm.ispEmail = ispFieldVo.email;
                        $scope.vm.ispUrl = ispFieldVo.url;
                        $scope.vm.ispMemo = ispFieldVo.memo;
                    }
                    if (hostingFieldVo != null){
                        $scope.vm.hostingId = hostingFieldVo.id;
                        $scope.vm.hostingName = hostingFieldVo.name;
                        $scope.vm.hostingCode = hostingFieldVo.code;
                        $scope.vm.hostingManager = hostingFieldVo.manager;
                        $scope.vm.hostingTel = hostingFieldVo.tel;
                        $scope.vm.hostingEmail = hostingFieldVo.email;
                        $scope.vm.hostingUrl = hostingFieldVo.url;
                        $scope.vm.hostingMemo = hostingFieldVo.memo;
                    }
                });

                // ISP정보 결과 값 Event 처리(set)

 src/main/webapp/views/issue/issueDetail.html

@@ -692,6 +692,9 @@
                            <div class="tab-content">
                                <!--    전체 기록 보기    -->
                                <div ng-if="vm.activeTab == 'ALL'">
                                    <div class="no-cont2" ng-if="vm.viewer.activeHistory.length < 1" translate="common.noRecord">
                                        기록이 없습니다.
                                    </div>
                                    <div class="ae-item row" ng-repeat="activeHistory in vm.viewer.activeHistory">
                                        <!--    기록인 경우   -->
                                        <div class="aei-content"
@@ -825,7 +828,7 @@
                                </div>
                                <!--    하위이슈 기록 보기    -->
                                <div ng-if="vm.activeTab == 'RECODE_DOWN'">
                                    <div class="no-cont2" ng-if="vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
                                    <div class="no-cont2" ng-if="!$root.isDefined(vm.viewer.activeDownAllHistory) || vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
                                        기록이 없습니다.
                                    </div>
                                    <div class="ae-item row" ng-repeat="issueDownHistory in vm.viewer.activeDownAllHistory">

			@@ -47,7 +47,7 @@
			if (issueCompanyFields != null && issueCompanyFields.size() > 0) {
			Map<String, Object> param = issueCompanyFields.get(0);

			if (param != null) {
			if (param != null && param.get("companyId") != null && param.get("companyId") != "") {
			CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId")); //companyId 가져오기

			Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
			@@ -62,20 +62,24 @@
			issueCompany.setCompanyField(companyField);
			issueCompany.setName(MapUtil.getString(param, "name"));
			issueCompany.setEmail(MapUtil.getString(param, "email"));
			issueCompany.setUrl(MapUtil.getString(param, "url"));
			issueCompany.setManager(MapUtil.getString(param, "manager"));
			issueCompany.setTel(MapUtil.getString(param, "tel"));
			issueCompany.setMemo(MapUtil.getString(param, "memo"));
			} else { //추가 할 경우
			issueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
			issueCompany.setIssue(issue);
			issueCompany.setCompanyField(companyField);
			if (companyField != null) {
			issueCompany.setCompanyField(companyField);
			}
			// 추가 이력
			StringBuilder sb = new StringBuilder();
			issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, param, issueCompany, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
			}
			this.issueCompanyRepository.saveAndFlush(issueCompany);

			} else {
			this.issueCompanyRepository.deleteById(MapUtil.getLong(param, "id"));
			}
			}
			}

			@@ -49,11 +49,11 @@
			if (issueIspFields != null && issueIspFields.size() > 0) {
			Map<String, Object> param = issueIspFields.get(0);

			if (param != null) {
			if (param != null && param.get("hostingId") != null && param.get("hostingId") != "") {
			HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));

			Set<IssueHosting> issueHostings = issue.getIssueHostingFields();
			IssueHosting issueHosting = null;
			IssueHosting issueHosting = new IssueHosting();

			if (issueHostings != null && issueHostings.size() >0){//수정 할 경우
			issueHosting = issueHostings.iterator().next();
			@@ -66,19 +66,24 @@
			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"));
			}else{//추가 할 경우
			issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
			issueHosting.setIssue(issue);
			issueHosting.setHostingField(hostingField);
			if (hostingField != null) {
			issueHosting.setHostingField(hostingField);
			}
			// 추가 이력
			StringBuilder sb = new StringBuilder();
			issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, issueHosting, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
			}
			this.issueHostingRepository.saveAndFlush(issueHosting);
			}else {
			this.issueHostingRepository.deleteById(MapUtil.getLong(param, "id"));
			}
			}
			}

			@@ -47,11 +47,11 @@
			if (issueIspFields != null && issueIspFields.size() > 0) {
			Map<String, Object> param = issueIspFields.get(0);

			if (param != null) {
			if (param != null && param.get("ispId") != null && param.get("ispId") != "") {
			IspField ispField = this.ispFieldService.getIsp(MapUtil.getLong(param, "ispId"));

			Set<IssueIsp> issueIsps = issue.getIssueIspFields();
			IssueIsp issueIsp = null;
			IssueIsp issueIsp = new IssueIsp();

			if (issueIsps != null && issueIsps.size() > 0) {//수정 할 경우
			issueIsp = issueIsps.iterator().next();
			@@ -64,19 +64,24 @@
			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"));
			} else {//추가 할 경우
			issueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
			issueIsp.setIssue(issue);
			issueIsp.setIspField(ispField);
			if (ispField != null) {
			issueIsp.setIspField(ispField);
			}
			// 추가 이력
			StringBuilder sb = new StringBuilder();
			issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, issueIsp, sb);
			issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
			}
			this.issueIspRepository.saveAndFlush(issueIsp);
			}else {
			this.issueIspRepository.deleteById(MapUtil.getLong(param, "id"));
			}
			}
			}

			@@ -399,6 +399,24 @@
			$scope.vm.companyUrl = result[0].url;
			$scope.vm.companyMemo = result[0].memo;

			$scope.vm.ispId = "";
			$scope.vm.ispName = "";
			$scope.vm.ispCode = "";
			$scope.vm.ispManager = "";
			$scope.vm.ispTel = "";
			$scope.vm.ispEmail = "";
			$scope.vm.ispUrl = "";
			$scope.vm.ispMemo = "";

			$scope.vm.hostingId = "";
			$scope.vm.hostingName = "";
			$scope.vm.hostingCode = "";
			$scope.vm.hostingManager = "";
			$scope.vm.hostingTel = "";
			$scope.vm.hostingEmail = "";
			$scope.vm.hostingUrl = "";
			$scope.vm.hostingMemo = "";

			if (ispFieldVo != null){
			$scope.vm.ispId = ispFieldVo.id;
			$scope.vm.ispName = ispFieldVo.name;

			@@ -394,23 +394,44 @@
			$scope.vm.companyUrl = result[0].url;
			$scope.vm.companyMemo = result[0].memo;

			$scope.vm.ispId = ispFieldVo.id;
			$scope.vm.ispName = ispFieldVo.name;
			$scope.vm.ispCode = ispFieldVo.code;
			$scope.vm.ispManager = ispFieldVo.manager;
			$scope.vm.ispTel = ispFieldVo.tel;
			$scope.vm.ispEmail = ispFieldVo.email;
			$scope.vm.ispUrl = ispFieldVo.url;
			$scope.vm.ispMemo = ispFieldVo.memo;
			$scope.vm.ispId = "";
			$scope.vm.ispName = "";
			$scope.vm.ispCode = "";
			$scope.vm.ispManager = "";
			$scope.vm.ispTel = "";
			$scope.vm.ispEmail = "";
			$scope.vm.ispUrl = "";
			$scope.vm.ispMemo = "";

			$scope.vm.hostingId = hostingFieldVo.id;
			$scope.vm.hostingName = hostingFieldVo.name;
			$scope.vm.hostingCode = hostingFieldVo.code;
			$scope.vm.hostingManager = hostingFieldVo.manager;
			$scope.vm.hostingTel = hostingFieldVo.tel;
			$scope.vm.hostingEmail = hostingFieldVo.email;
			$scope.vm.hostingUrl = hostingFieldVo.url;
			$scope.vm.hostingMemo = hostingFieldVo.memo;
			$scope.vm.hostingId = "";
			$scope.vm.hostingName = "";
			$scope.vm.hostingCode = "";
			$scope.vm.hostingManager = "";
			$scope.vm.hostingTel = "";
			$scope.vm.hostingEmail = "";
			$scope.vm.hostingUrl = "";
			$scope.vm.hostingMemo = "";

			if (ispFieldVo != null){
			$scope.vm.ispId = ispFieldVo.id;
			$scope.vm.ispName = ispFieldVo.name;
			$scope.vm.ispCode = ispFieldVo.code;
			$scope.vm.ispManager = ispFieldVo.manager;
			$scope.vm.ispTel = ispFieldVo.tel;
			$scope.vm.ispEmail = ispFieldVo.email;
			$scope.vm.ispUrl = ispFieldVo.url;
			$scope.vm.ispMemo = ispFieldVo.memo;
			}
			if (hostingFieldVo != null){
			$scope.vm.hostingId = hostingFieldVo.id;
			$scope.vm.hostingName = hostingFieldVo.name;
			$scope.vm.hostingCode = hostingFieldVo.code;
			$scope.vm.hostingManager = hostingFieldVo.manager;
			$scope.vm.hostingTel = hostingFieldVo.tel;
			$scope.vm.hostingEmail = hostingFieldVo.email;
			$scope.vm.hostingUrl = hostingFieldVo.url;
			$scope.vm.hostingMemo = hostingFieldVo.memo;
			}
			});

			// ISP정보 결과 값 Event 처리(set)

			@@ -406,23 +406,44 @@
			$scope.vm.companyUrl = result[0].url;
			$scope.vm.companyMemo = result[0].memo;

			$scope.vm.ispId = ispFieldVo.id;
			$scope.vm.ispName = ispFieldVo.name;
			$scope.vm.ispCode = ispFieldVo.code;
			$scope.vm.ispManager = ispFieldVo.manager;
			$scope.vm.ispTel = ispFieldVo.tel;
			$scope.vm.ispEmail = ispFieldVo.email;
			$scope.vm.ispUrl = ispFieldVo.url;
			$scope.vm.ispMemo = ispFieldVo.memo;
			$scope.vm.ispId = "";
			$scope.vm.ispName = "";
			$scope.vm.ispCode = "";
			$scope.vm.ispManager = "";
			$scope.vm.ispTel = "";
			$scope.vm.ispEmail = "";
			$scope.vm.ispUrl = "";
			$scope.vm.ispMemo = "";

			$scope.vm.hostingId = hostingFieldVo.id;
			$scope.vm.hostingName = hostingFieldVo.name;
			$scope.vm.hostingCode = hostingFieldVo.code;
			$scope.vm.hostingManager = hostingFieldVo.manager;
			$scope.vm.hostingTel = hostingFieldVo.tel;
			$scope.vm.hostingEmail = hostingFieldVo.email;
			$scope.vm.hostingUrl = hostingFieldVo.url;
			$scope.vm.hostingMemo = hostingFieldVo.memo;
			$scope.vm.hostingId = "";
			$scope.vm.hostingName = "";
			$scope.vm.hostingCode = "";
			$scope.vm.hostingManager = "";
			$scope.vm.hostingTel = "";
			$scope.vm.hostingEmail = "";
			$scope.vm.hostingUrl = "";
			$scope.vm.hostingMemo = "";

			if (ispFieldVo != null){
			$scope.vm.ispId = ispFieldVo.id;
			$scope.vm.ispName = ispFieldVo.name;
			$scope.vm.ispCode = ispFieldVo.code;
			$scope.vm.ispManager = ispFieldVo.manager;
			$scope.vm.ispTel = ispFieldVo.tel;
			$scope.vm.ispEmail = ispFieldVo.email;
			$scope.vm.ispUrl = ispFieldVo.url;
			$scope.vm.ispMemo = ispFieldVo.memo;
			}
			if (hostingFieldVo != null){
			$scope.vm.hostingId = hostingFieldVo.id;
			$scope.vm.hostingName = hostingFieldVo.name;
			$scope.vm.hostingCode = hostingFieldVo.code;
			$scope.vm.hostingManager = hostingFieldVo.manager;
			$scope.vm.hostingTel = hostingFieldVo.tel;
			$scope.vm.hostingEmail = hostingFieldVo.email;
			$scope.vm.hostingUrl = hostingFieldVo.url;
			$scope.vm.hostingMemo = hostingFieldVo.memo;
			}
			});

			// ISP정보 결과 값 Event 처리(set)

			@@ -55,7 +55,7 @@
			// 이슈 목록 컨트롤러 vm, fn 상속 중
			$scope.vm.viewer = {}; // 현재 이슈
			$scope.vm.images = []; // 첨부된 파일 중 이미지 파일
			$scope.vm.activeTab = "ALL"; // 활동 내역 탭
			$scope.vm.activeTab = "RECODE"; // 활동 내역 탭
			// 이슈 상태 변경 표시 여부
			$scope.vm.editor = {
			issueStatus : false
			@@ -1000,16 +1000,24 @@
			$scope.vm.viewer.activeParentHistory = "";
			$scope.vm.viewer.activeDownHistory = "";
			$scope.vm.viewer.activeDownAllHistory = "";
			$scope.vm.viewer.downComment = "";
			var downTitle = "";
			var oriDownHistory = [];
			var oriDownCommentHistory = [];

			// 하위이슈 히스토리
			for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++){
			if($scope.vm.viewer.issueDownVos.length > 1){
			$scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos.concat($scope.vm.viewer.issueDownVos[i+1].issueHistoryVos);
			i++;
			}else {
			$scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos;
			oriDownHistory.push($scope.vm.viewer.issueDownVos[i].issueHistoryVos);
			oriDownCommentHistory.push($scope.vm.viewer.issueDownVos[i].issueCommentVos);
			}
			for (var i=0; i<oriDownHistory.length; i++){
			if ($scope.vm.viewer.activeDownHistory === "") {
			$scope.vm.viewer.activeDownHistory = oriDownHistory[i];
			} else {
			$scope.vm.viewer.activeDownHistory = $scope.vm.viewer.activeDownHistory.concat(oriDownHistory[i]);
			}
			}

			for (var i=0; i<$scope.vm.viewer.activeDownHistory.length; i++){
			downTitle = "<div class='dot' style='margin-bottom: -8px'>*하위이슈 : "+$scope.vm.viewer.activeDownHistory[i].title+"</div>";
			$scope.vm.viewer.activeDownHistory[i].desc = downTitle + $scope.vm.viewer.activeDownHistory[i].description;
			@@ -1019,12 +1027,11 @@
			});

			// 하위이슈 댓글 히스토리
			for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++) {
			if($scope.vm.viewer.issueDownVos.length > 1){
			$scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos.concat($scope.vm.viewer.issueDownVos[i+1].issueCommentVos);
			i++;
			for (var i=0; i<oriDownCommentHistory.length; i++) {
			if ($scope.vm.viewer.downComment === "") {
			$scope.vm.viewer.downComment = oriDownCommentHistory[i];
			} else {
			$scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos;
			$scope.vm.viewer.downComment = $scope.vm.viewer.downComment.concat(oriDownCommentHistory[i]);
			}
			}
			$scope.vm.viewer.issueDownVos.sort(function (a, b) { //내림차순

			@@ -382,24 +382,44 @@
			$scope.vm.companyUrl = result[0].url;
			$scope.vm.companyMemo = result[0].memo;

			$scope.vm.ispId = ispFieldVo.id;
			$scope.vm.ispName = ispFieldVo.name;
			$scope.vm.ispCode = ispFieldVo.code;
			$scope.vm.ispManager = ispFieldVo.manager;
			$scope.vm.ispTel = ispFieldVo.tel;
			$scope.vm.ispEmail = ispFieldVo.email;
			$scope.vm.ispUrl = ispFieldVo.url;
			$scope.vm.ispMemo = ispFieldVo.memo;
			$scope.vm.ispId = "";
			$scope.vm.ispName = "";
			$scope.vm.ispCode = "";
			$scope.vm.ispManager = "";
			$scope.vm.ispTel = "";
			$scope.vm.ispEmail = "";
			$scope.vm.ispUrl = "";
			$scope.vm.ispMemo = "";

			$scope.vm.hostingId = hostingFieldVo.id;
			$scope.vm.hostingName = hostingFieldVo.name;
			$scope.vm.hostingCode = hostingFieldVo.code;
			$scope.vm.hostingManager = hostingFieldVo.manager;
			$scope.vm.hostingTel = hostingFieldVo.tel;
			$scope.vm.hostingEmail = hostingFieldVo.email;
			$scope.vm.hostingUrl = hostingFieldVo.url;
			$scope.vm.hostingMemo = hostingFieldVo.memo;
			$scope.vm.hostingId = "";
			$scope.vm.hostingName = "";
			$scope.vm.hostingCode = "";
			$scope.vm.hostingManager = "";
			$scope.vm.hostingTel = "";
			$scope.vm.hostingEmail = "";
			$scope.vm.hostingUrl = "";
			$scope.vm.hostingMemo = "";

			if (ispFieldVo != null){
			$scope.vm.ispId = ispFieldVo.id;
			$scope.vm.ispName = ispFieldVo.name;
			$scope.vm.ispCode = ispFieldVo.code;
			$scope.vm.ispManager = ispFieldVo.manager;
			$scope.vm.ispTel = ispFieldVo.tel;
			$scope.vm.ispEmail = ispFieldVo.email;
			$scope.vm.ispUrl = ispFieldVo.url;
			$scope.vm.ispMemo = ispFieldVo.memo;
			}
			if (hostingFieldVo != null){
			$scope.vm.hostingId = hostingFieldVo.id;
			$scope.vm.hostingName = hostingFieldVo.name;
			$scope.vm.hostingCode = hostingFieldVo.code;
			$scope.vm.hostingManager = hostingFieldVo.manager;
			$scope.vm.hostingTel = hostingFieldVo.tel;
			$scope.vm.hostingEmail = hostingFieldVo.email;
			$scope.vm.hostingUrl = hostingFieldVo.url;
			$scope.vm.hostingMemo = hostingFieldVo.memo;
			}
			});

			// ISP정보 결과 값 Event 처리(set)

			@@ -692,6 +692,9 @@
			<div class="tab-content">
			<!-- 전체 기록 보기 -->
			<div ng-if="vm.activeTab == 'ALL'">
			<div class="no-cont2" ng-if="vm.viewer.activeHistory.length < 1" translate="common.noRecord">
			기록이 없습니다.
			</div>
			<div class="ae-item row" ng-repeat="activeHistory in vm.viewer.activeHistory">
			<!-- 기록인 경우 -->
			<div class="aei-content"
			@@ -825,7 +828,7 @@
			</div>
			<!-- 하위이슈 기록 보기 -->
			<div ng-if="vm.activeTab == 'RECODE_DOWN'">
			<div class="no-cont2" ng-if="vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
			<div class="no-cont2" ng-if="!$root.isDefined(vm.viewer.activeDownAllHistory) \|\| vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
			기록이 없습니다.
			</div>
			<div class="ae-item row" ng-repeat="issueDownHistory in vm.viewer.activeDownAllHistory">