From bdb1efdc604fce543e21152b4263a9362f64389f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 목, 10 3월 2022 15:35:19 +0900
Subject: [PATCH] - api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 ip 컬럼 추가 및 이슈 추가/수정 시 ip 대역대 항목 추가
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 0a6f32d..75a7ca0 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -89,6 +89,8 @@
companyTel : "", // �뾽泥� �쟾�솕踰덊샇
companyEmail : "", // �뾽泥� �씠硫붿씪
companyUrl : "", // �뾽泥� url
+ ipStart : "", //ip�떆�옉二쇱냼
+ ipEnd : "", //ip醫낅즺二쇱냼
companyMemo : "", // �뾽泥� 鍮꾧퀬
ispId : -1, // ISP ID
ispName : "", // ISP 紐�
@@ -431,7 +433,16 @@
}
// �뾽醫�(��遺꾨쪟) autocomplete page �뾽�뜲�씠�듃
- function getParentSectorListCallBack(result) {
+ function getParentSectorListCallBack(result, value) {
+ if (value === "") {
+ $scope.vm.form.parentSectorId = "";
+ if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
+ $scope.vm.form.parentSectors[0].id = "";
+ }
+ $scope.vm.form.childSectorId = "";
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ }
$scope.vm.autoCompletePage.parentSector.totalPage = result.data.page.totalPage;
}
@@ -470,6 +481,8 @@
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
$scope.vm.companyUrl = result[0].url;
+ $scope.vm.ipStart = result[0].ipStart;
+ $scope.vm.ipEnd = result[0].ipEnd;
$scope.vm.companyMemo = result[0].memo;
$scope.vm.form.companyTypeId = result[0].companyTypeId;
$scope.vm.form.parentSectorId = result[0].parentSectorId;
@@ -559,6 +572,11 @@
$scope.$on("parentSectorEvent", function (event, result) {
if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
$scope.vm.form.parentSectorId = result[0].id;
+ } else {
+ $scope.vm.form.parentSectorId = "";
+ if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
+ $scope.vm.form.parentSectors[0].id = "";
+ }
}
$scope.vm.form.childSectorId = "";
$scope.vm.form.childSector = "";
@@ -675,12 +693,15 @@
tel : $scope.vm.companyTel,
email :$scope.vm.companyEmail,
url :$scope.vm.companyUrl,
+ ipStart :$scope.vm.ipStart,
+ ipEnd :$scope.vm.ipEnd,
memo : $scope.vm.companyMemo,
companyTypeId : $scope.vm.form.companyTypeId,
parentSectorId : $scope.vm.form.parentSectorId,
childSectorId : $scope.vm.form.childSectorId,
regionId : $scope.vm.form.regionId,
- statusId : $scope.vm.form.statusId
+ statusId : $scope.vm.form.statusId,
+ statusName : $scope.vm.form.status
});
}
return issueCompanyFields;
@@ -690,6 +711,8 @@
companyTel : $scope.vm.companyTel,
companyEmail :$scope.vm.companyEmail,
companyUrl :$scope.vm.companyUrl,
+ ipStart :$scope.vm.ipStart,
+ ipEnd :$scope.vm.ipEnd,
companyMemo : $scope.vm.companyMemo,
companyTypeId : (function () {
var companyTypeId = null;
@@ -911,6 +934,19 @@
if (result.data.message.status === "success") {
$scope.vm.issueTypes = result.data.data;
+
+ // option 鍮덇컪 諛⑹�
+ if ($rootScope.isDefined($scope.vm.issueTypes) && $scope.vm.issueTypes.length > 0) {
+ let chk = 0;
+ angular.forEach($scope.vm.issueTypes, function (issueType) {
+ if (issueType.id.toString() === $scope.vm.form.issueTypeId.toString()) {
+ chk ++;
+ }
+ });
+ if (chk === 0) {
+ $scope.vm.form.issueTypeId = null;
+ }
+ }
}
else {
SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // �씠�뒋 ���엯 紐⑸줉 議고쉶 �떎�뙣
--
Gitblit v1.8.0