From d348049a4a3c9fa32c3eb566c69df6d8adf652a8 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 월, 29 11월 2021 01:57:02 +0900 Subject: [PATCH] 이슈 상세 유형별 수정 --- src/main/webapp/scripts/app/issue/issueModify.controller.js | 53 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 44 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js index 8700bf4..8d55538 100644 --- a/src/main/webapp/scripts/app/issue/issueModify.controller.js +++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js @@ -9,9 +9,9 @@ ], function (app, angular) { app.controller('issueModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', '$injector', - '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'parameter', 'Issue', 'User', 'AttachedFile', 'IssueType', 'Priority', 'Severity', 'IssueTypeCustomField', '$filter', + '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'parameter', 'Issue', 'User', 'AttachedFile', 'IssueType', 'Priority', 'Severity', 'HostingField', 'IssueTypeCustomField', '$filter', function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, $injector, $controller, $tableProvider, SweetAlert, $timeout, - $stateParams, $q, parameter, Issue, User, AttachedFile, IssueType, Priority, Severity, IssueTypeCustomField, $filter) { + $stateParams, $q, parameter, Issue, User, AttachedFile, IssueType, Priority, Severity, HostingField, IssueTypeCustomField, $filter) { $scope.fn = { cancel : cancel, // �뙘�뾽 李� �떕湲� @@ -37,10 +37,13 @@ removeDepartment : removeDepartment, // �떞�떦遺��꽌 �궘�젣 removeUploadFile : removeUploadFile, // �듅�젙 �뙆�씪�쓣 �궘�젣 setIssueTypeTemplate : setIssueTypeTemplate, // �씠�뒋 �쑀�삎 �뀥�뵆由� �쟻�슜�븯湲� - startExecute : startExecute // 理쒖큹 �떎�뻾 + startExecute : startExecute, // 理쒖큹 �떎�뻾 + containsPartner : containsPartner, + getPartners : getPartners }; $scope.vm = { + partnerVos : "", search : { id : parameter.id, deep : "02" // �봽濡쒖젥�듃 �뿰愿��맂 紐⑤뱺 �젙蹂대�� �뼱�뒓�젙�룄源뚯� 媛��졇�삱吏� 寃곗젙, 01 - �궗�슜�옄, 愿�由ъ옄 �젙蹂� @@ -56,7 +59,7 @@ priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒 severityId : "", // 以묒슂�룄 �븘�씠�뵒 issueStatusId : "", // �씠�뒋 �긽�깭 �븘�씠�뵒 - // users : [], // �떞�떦�옄 + users : [], // �떞�떦�옄 departments : [], // �떞�떦遺��꽌 files : [], // �뾽濡쒕뱶 �뙆�씪 attachedFiles : [], // �꽟癒몃끂�듃濡� �뙆�씪 �뾽濡쒕뱶瑜� �븷 寃쎌슦 �꽌踰꾩뿉�꽌 pk瑜� �뵲怨� issue id�� �뿰�룞 �옉�뾽�씠 �븘�슂�븯�떎. @@ -139,6 +142,11 @@ } } }); + + $scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) { + $scope.vm.partnerVos = $scope.fn.getPartners(); + }); + // �뾽濡쒕뱶 �뙆�씪 �궘�젣 function removeUploadFile(index) { @@ -654,6 +662,21 @@ return deferred.promise; } + // �뾽泥�/ISP/�샇�뒪�똿 �씠由꾩씠 �룷�븿 �뿬遺� �솗�씤 + function containsPartner(name) { + var result = false; + + if ($scope.vm.partnerVos != null) { + $scope.vm.partnerVos.forEach(function (partnerVo) { + if (name === partnerVo.name) { + result = true; + } + }); + } + return result; + + } + // 以묒슂�룄 紐⑸줉 function getSeverities() { var deferred = $q.defer(); @@ -778,7 +801,7 @@ if (result.data.data.issueCompanyVos != null && result.data.data.issueCompanyVos.length > 0) { $scope.vm.form.issueCompanyFields = result.data.data.issueCompanyVos; var issueCompanyFieldValue = result.data.data.issueCompanyVos[0]; - $scope.vm.companyId = issueCompanyFieldValue.id; + $scope.vm.companyId = issueCompanyFieldValue.companyId; $scope.vm.companyName = issueCompanyFieldValue.name; $scope.vm.companyManager = issueCompanyFieldValue.manager; $scope.vm.companyTel = issueCompanyFieldValue.tel; @@ -788,7 +811,7 @@ if (result.data.data.issueIspVos != null && result.data.data.issueIspVos.length > 0) { $scope.vm.form.issueIspFields = result.data.data.issueIspVos; var issueIspFieldValue = result.data.data.issueIspVos[0]; - $scope.vm.ispId = issueIspFieldValue.id; + $scope.vm.ispId = issueIspFieldValue.ispId; $scope.vm.ispName = issueIspFieldValue.name; $scope.vm.ispCode = issueIspFieldValue.code; $scope.vm.ispManager = issueIspFieldValue.manager; @@ -800,7 +823,7 @@ if (result.data.data.issueHostingVos != null && result.data.data.issueHostingVos.length > 0) { $scope.vm.form.issueHostingFields = result.data.data.issueHostingVos; var issueHostingFieldValue = result.data.data.issueHostingVos[0]; - $scope.vm.hostingId = issueHostingFieldValue.id; + $scope.vm.hostingId = issueHostingFieldValue.hostingId; $scope.vm.hostingName = issueHostingFieldValue.name; $scope.vm.hostingCode = issueHostingFieldValue.code; $scope.vm.hostingManager = issueHostingFieldValue.manager; @@ -872,14 +895,26 @@ } } + function getPartners() { + + HostingField.getPartnerList($resourceProvider.getContent( + {}, + $resourceProvider.getPageContent(0, 1))).then(function (result) { + if (result.data.message.status === "success") { + $scope.vm.partnerVos = result.data.data.usePartnerVos; + } + }); + + } + // 理쒖큹 �떎�뻾 function startExecute() { var promises = { detail : $scope.fn.detail(), getIssueTypes : $scope.fn.getIssueTypes(), - getPriorities : $scope.fn.getPriorities(), - getSeverities : $scope.fn.getSeverities() + getSeverities : $scope.fn.getSeverities(), + getPartners : $scope.fn.getPartners() }; $q.all(promises).then(function (results) { -- Gitblit v1.8.0