src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
src/main/webapp/scripts/app/issue/issueAdd.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
src/main/webapp/scripts/app/issue/issueAddRelation.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
src/main/webapp/scripts/app/issue/issueModify.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
src/main/webapp/views/issue/issueAddRelation.html | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
src/main/webapp/views/issue/issueModify.html | ●●●●● 패치 | 보기 | raw | blame | 히스토리 |
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -212,15 +212,13 @@ for (Map<String, Object> result : results) { CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class); if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1){ //IspField ispField = this.ispFieldRepository.getOne(companyFieldVo.getIspId()); IspField ispField = this.ispFieldService.getIsp(companyFieldVo.getIspId()); if(ispField != null){ IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class); companyFieldVo.setIspFieldVo(ispFieldVo); } } if(companyFieldVo.getHostingId() != null && companyFieldVo.getIspId() != -1){ //HostingField hostingField = this.hostingFieldRepository.getOne(companyFieldVo.getHostingId()); if(companyFieldVo.getHostingId() != null && companyFieldVo.getHostingId() != -1){ HostingField hostingField = this.hostingFieldService.getHosting(companyFieldVo.getHostingId()); if(hostingField != null){ HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class); src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -84,14 +84,14 @@ name : $rootScope.preventXss($scope.vm.form.name), ispId : (function () { // ISP 아이디 var ispId = -1; if ($scope.vm.form.issueIspFields.length > 0) { if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0) { ispId = $scope.vm.form.ispId; } return ispId; })(), hostingId : (function () { // Hosting 아이디 var hostingId = -1; if ($scope.vm.form.issueHostingFields.length > 0) { if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) { hostingId = $scope.vm.form.hostingId; } return hostingId; src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -464,7 +464,7 @@ companyId : (function () { // 업체 아이디 var companyId = -1; if ($scope.vm.form.issueCompanyFields.length > 0) { if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) { companyId = $scope.vm.form.issueCompanyFields[0].id; } return companyId; @@ -472,7 +472,7 @@ ispId : (function () { // ISP 아이디 var ispId = -1; if ($scope.vm.form.issueIspFields.length > 0) { if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0) { ispId = $scope.vm.form.issueIspFields[0].id; } return ispId; @@ -480,7 +480,7 @@ hostingId : (function () { // Hosting 아이디 var hostingId = -1; if ($scope.vm.form.issueHostingFields.length > 0) { if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) { hostingId = $scope.vm.form.issueHostingFields[0].id; } return hostingId; src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
@@ -395,6 +395,9 @@ // 업체정보 결과 값 Event 처리(set) $scope.$on("companyFieldEvent", function (event, result) { var ispFieldVo = result[0].ispFieldVo; var hostingFieldVo = result[0].hostingFieldVo; $scope.vm.companyId = result[0].id; $scope.vm.companyName = result[0].name; $scope.vm.companyManager = result[0].manager; @@ -403,6 +406,21 @@ $scope.vm.companyUrl = result[0].url; $scope.vm.companyMemo = result[0].memo; $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.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) @@ -496,7 +514,7 @@ hostingId : (function () { var hostingId = -1; if ($scope.vm.form.issueHostingFields.length > 0) { if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) { hostingId = $scope.vm.form.issueHostingFields[0].id; } src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -371,6 +371,9 @@ // 업체정보 결과 값 Event 처리(set) $scope.$on("companyFieldEvent", function (event, result) { var ispFieldVo = result[0].ispFieldVo; var hostingFieldVo = result[0].hostingFieldVo; $scope.vm.companyId = result[0].id; $scope.vm.companyName = result[0].name; $scope.vm.companyManager = result[0].manager; @@ -378,6 +381,22 @@ $scope.vm.companyEmail = result[0].email; $scope.vm.companyUrl = result[0].url; $scope.vm.companyMemo = result[0].memo; $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.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; }); @@ -471,7 +490,7 @@ hostingId : (function () { var hostingId = -1; if ($scope.vm.form.issueHostingFields.length > 0) { if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) { hostingId = $scope.vm.form.issueHostingFields[0].id; } src/main/webapp/views/issue/issueAddRelation.html
@@ -380,7 +380,8 @@ <div ng-show="fn.containsPartner('업체')" class="row"> <div class="col-lg-8 fontcolor_green"> <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">업체정보</span> <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 업체 이름 클릭시 선택된 이름의 업체 정보가 조회됩니다.</span> <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 업체 이름 클릭시 선택된 이름의 업체 정보가 조회되며, 업체정보에서 추가한 ISP, 호스팅 정보를 불러옵니다.</span> </label> </div> </div> @@ -486,7 +487,7 @@ <div ng-show="fn.containsPartner('ISP')" class="row"> <div class="col-lg-8 fontcolor_green"> <label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP 정보</span> <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP 이름 클릭시 선택된 이름의 ISP 정보가 조회됩니다.</span> <!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP 이름 클릭시 선택된 이름의 ISP 정보가 조회됩니다.</span>--> </label> </div> </div> @@ -495,7 +496,15 @@ <div class="col-lg-4"> <div class="form-group mb10"> <label class="issue-label"> <span translate="ispField.name">ISP 이름</span> </label> <js-autocomplete-single data-input-name="ispField" <input name="ispName" type="text" class="form-control" kr-input autocomplete="off" ng-model="vm.ispName" ng-maxlength="100" maxlength="100"> <!--<js-autocomplete-single data-input-name="ispField" selected-model="vm.form.issueIspFields" search="vm.ispName" source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.ispField.page, fn.getIssueIspFieldListCallBack)" @@ -505,7 +514,7 @@ translation-texts="{ empty : 'common.emptyIsp' }" broad-cast="ispFieldEvent" extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '', type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single> type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>--> </div> </div> <div class="col-lg-4"> @@ -606,7 +615,7 @@ <div ng-show="fn.containsPartner('호스팅')" class="row"> <div class="col-lg-8 fontcolor_green"> <label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">호스팅 정보</span> <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 호스팅 이름 클릭시 선택된 이름의 호스팅 정보가 조회됩니다.</span> <!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 호스팅 이름 클릭시 선택된 이름의 호스팅 정보가 조회됩니다.</span>--> </label> </div> </div> @@ -615,7 +624,15 @@ <div class="col-lg-4"> <div class="form-group mb10"> <label class="issue-label"> <span translate="hostingField.name">호스팅 이름</span> </label> <js-autocomplete-single data-input-name="hostingField" <input name="hostingName" type="text" class="form-control" kr-input autocomplete="off" ng-model="vm.hostingName" ng-maxlength="100" maxlength="100"> <!--<js-autocomplete-single data-input-name="hostingField" selected-model="vm.form.issueHostingFields" search="vm.hostingName" source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)" @@ -625,7 +642,7 @@ translation-texts="{ empty : 'common.emptyHosting' }" broad-cast="hostingFieldEvent" extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '', type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single> type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>--> </div> </div> <div class="col-lg-4"> src/main/webapp/views/issue/issueModify.html
@@ -370,7 +370,8 @@ <div ng-show="fn.containsPartner('업체')" class="row"> <div class="col-lg-8 fontcolor_green"> <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">업체정보</span> <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 업체 이름 클릭시 선택된 이름의 업체 정보가 조회됩니다.</span> <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 업체 이름 클릭시 선택된 이름의 업체 정보가 조회되며, 업체정보에서 추가한 ISP, 호스팅 정보를 불러옵니다.</span> </label> </div> </div> @@ -476,7 +477,7 @@ <div ng-show="fn.containsPartner('ISP')" class="row"> <div class="col-lg-8 fontcolor_green"> <label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP 정보</span> <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP 이름 클릭시 선택된 이름의 ISP 정보가 조회됩니다.</span> <!-- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP 이름 클릭시 선택된 이름의 ISP 정보가 조회됩니다.</span>--> </label> </div> </div> @@ -485,7 +486,15 @@ <div class="col-lg-4"> <div class="form-group mb10"> <label class="issue-label"> <span translate="ispField.name">ISP 이름</span> </label> <js-autocomplete-single data-input-name="ispField" <input name="ispName" type="text" class="form-control" kr-input autocomplete="off" ng-model="vm.ispName" ng-maxlength="100" maxlength="100"> <!--<js-autocomplete-single data-input-name="ispField" selected-model="vm.form.issueIspFields" search="vm.ispName" source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.ispField.page, fn.getIssueIspFieldListCallBack)" @@ -495,7 +504,7 @@ translation-texts="{ empty : 'common.emptyIsp' }" broad-cast="ispFieldEvent" extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '', type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single> type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>--> </div> </div> <div class="col-lg-4"> @@ -596,7 +605,7 @@ <div ng-show="fn.containsPartner('호스팅')" class="row"> <div class="col-lg-8 fontcolor_green"> <label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">호스팅 정보</span> <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 호스팅 이름 클릭시 선택된 이름의 호스팅 정보가 조회됩니다.</span> <!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 호스팅 이름 클릭시 선택된 이름의 호스팅 정보가 조회됩니다.</span>--> </label> </div> </div> @@ -605,8 +614,17 @@ <div class="col-lg-4"> <div class="form-group mb10"> <label class="issue-label"> <span translate="hostingField.name">호스팅 이름</span> </label> <js-autocomplete-single data-input-name="hostingField" <input name="hostingName" type="text" class="form-control" kr-input autocomplete="off" ng-model="vm.hostingName" ng-maxlength="100" maxlength="100"> <!--<js-autocomplete-single data-input-name="hostingField" selected-model="vm.form.issueHostingFields" ng-model="vm.hostingName" search="vm.hostingName" source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)" page="vm.autoCompletePage.hostingField.page" @@ -615,7 +633,7 @@ translation-texts="{ empty : 'common.emptyHosting' }" broad-cast="hostingFieldEvent" extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '', type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single> type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>--> </div> </div> <div class="col-lg-4">