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/issueAddRelation.controller.js | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
index 94dee8e..b864616 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
@@ -45,6 +45,7 @@
getChildSectorListCallBack : getChildSectorListCallBack,
getRegionListCallBack : getRegionListCallBack,
getStatusListCallBack : getStatusListCallBack,
+ getIssueTypeOfProject : getIssueTypeOfProject
};
$scope.vm = {
@@ -97,6 +98,8 @@
companyTel : "", // �뾽泥� �쟾�솕踰덊샇
companyEmail : "", // �뾽泥� �씠硫붿씪
companyUrl : "", // �뾽泥� url
+ ipStart : "", //ip�떆�옉二쇱냼
+ ipEnd : "", //ip醫낅즺二쇱냼
companyMemo : "", // �뾽泥� 鍮꾧퀬
ispId : -1, // ISP ID
ispName : "", // ISP 紐�
@@ -203,6 +206,8 @@
} else {
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲�
$scope.fn.getIssueTypeCustomFields();
+ // �꽑�깮�븳 �봽濡쒖젥�듃�뿉 �냽�빐�엳�뒗 �씠�뒋�쑀�삎留� 蹂댁뿬二쇨린
+ $scope.fn.getIssueTypeOfProject();
}
}
});
@@ -482,6 +487,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;
@@ -610,6 +617,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 = -1;
@@ -754,6 +763,8 @@
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,
@@ -925,6 +936,39 @@
if (result.data.message.status === "success") {
$scope.vm.issueTypes = result.data.data;
+ }
+ else {
+ SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // �씠�뒋 ���엯 紐⑸줉 議고쉶 �떎�뙣
+ }
+
+ deferred.resolve(result.data.data);
+ });
+
+ return deferred.promise;
+ }
+
+ // �꽑�깮�븳 �봽濡쒖젥�듃�뿉 �냽�빐�엳�뒗 �씠�뒋�쑀�삎留� 蹂댁뿬二쇨린
+ function getIssueTypeOfProject() {
+ var deferred = $q.defer();
+
+ IssueType.find($resourceProvider.getContent({projectId : $scope.vm.form.projects[0].id},
+ $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+
+ 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"); // �씠�뒋 ���엯 紐⑸줉 議고쉶 �떎�뙣
@@ -1129,6 +1173,9 @@
$scope.vm.projectName = $rootScope.workProject.name;
$scope.vm.form.projects = [];
$scope.vm.form.projects.push($rootScope.workProject);
+ } else {
+ $scope.vm.projectName = parameter.project.name;
+ $scope.vm.form.projects.push(parameter.project);
}
// �쁽�옱 �씠�뒋���엯 �쑀�삎 �꽕�젙
var id = $rootScope.getCurrentIssueTypeId();
@@ -1137,6 +1184,10 @@
} else {
$scope.vm.form.issueTypeId = parameter.issueTypeId.toString();
}
+ // �봽濡쒖젥�듃�쓽 �씠�뒋�쑀�삎 set
+ $scope.fn.getIssueTypeOfProject();
+ // �씠�뒋�쑀�삎, �봽濡쒖젥�듃 set �븳 �썑�뿉 �궗�슜�옄�젙�쓽�븘�뱶 set
+ $scope.fn.getIssueTypeCustomFields();
$log.debug("promises 寃곌낵 ", results);
});
}
--
Gitblit v1.8.0