- api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 i...

minhee

2022-03-10 bdb1efdc604fce543e21152b4263a9362f64389f

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

@@ -90,6 +90,8 @@
                    companyTel : "",  // 업체 전화번호
                    companyEmail : "",  // 업체 이메일
                    companyUrl : "", // 업체 url
                    ipStart : "", //ip시작주소
                    ipEnd : "", //ip종료주소
                    companyMemo : "",  // 업체 비고
                    ispId : -1, // ISP ID
                    ispName : "", // ISP 명
@@ -468,6 +470,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;
@@ -596,6 +600,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;
@@ -740,6 +746,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,
@@ -845,8 +853,6 @@
                        if (result.data.message.status === "success") {
                            $scope.fn.addDownIssue(result.data.data);

                            $scope.fn.cancel();

                            //  이슈 상세 화면 요청
                            $rootScope.$broadcast("getIssueDetail", {
                                id : parameter.id
@@ -862,29 +868,59 @@
                }

                // 하위 이슈 추가
                function addDownIssue(downId) {
                function addDownIssue(issueVo) {
                    $rootScope.spinner = true;
                    let inheritYn = issueVo.inheritPartners;
                    let usePartner = issueVo.usePartner;

                    var ids = [];
                    let inheritYn = false;
                    if (issueVo.id != null) {
                        ids.push(issueVo.id);
                    }

                    SweetAlert.swal({
                        title : $filter("translate")("issue.addDownIssue"), // 하위 이슈 추가
                        text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // 상위이슈의 파트너 정보(업체/ISP/호스팅)를 적용시키겠습니까?
                        type : "warning",
                        showCancelButton : true,
                        confirmButtonColor : "#DD6B55",
                        confirmButtonText : $filter("translate")("common.ok"), // 네
                        cancelButtonText : $filter("translate")("common.no"), // 아니오
                        closeOnConfirm : false,
                        closeOnCancel : false
                    },
                    function (isConfirm) {
                        if (isConfirm) {
                            inheritYn = true;
                        }
                    if ($rootScope.isDefined(usePartner) && usePartner > 0
                            && $rootScope.isDefined(inheritYn) && inheritYn) {
                        SweetAlert.swal({
                            title : $filter("translate")("issue.addDownIssue"), // 하위 이슈 추가
                            text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // 상위이슈의 파트너 정보(업체/ISP/호스팅)를 적용시키겠습니까?
                            type : "warning",
                            showCancelButton : true,
                            confirmButtonColor : "#DD6B55",
                            confirmButtonText : $filter("translate")("common.ok"), // 네
                            cancelButtonText : $filter("translate")("common.no"), // 아니오
                            closeOnConfirm : false,
                            closeOnCancel : false
                        },
                        function (isConfirm) {
                            if (!isConfirm) {
                                inheritYn = false;
                            }

                        if (downId != null) {
                            ids.push(downId);
                        }
                            var contents = {
                                issueId :  parameter.id,
                                ids : ids,
                                parentIssueId : parameter.id,
                                inheritYn : inheritYn
                            };

                            Issue.modifyParentIssue($resourceProvider.getContent(
                                contents,
                                $resourceProvider.getPageContent(0, 10))).then(function (result) {

                                if (result.data.message.status === "success") {
                                    $scope.fn.cancel();
                                    //  이슈 상세 화면 요청
                                    $rootScope.$broadcast("getIssueDetail", {
                                        id : parameter.id
                                    });
                                }
                                else {
                                    SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "하위이슈 생성 실패"
                                }
                                $rootScope.spinner = false;
                            });
                        });
                    } else {

                        var contents = {
                            issueId :  parameter.id,
@@ -898,7 +934,7 @@
                            $resourceProvider.getPageContent(0, 10))).then(function (result) {

                            if (result.data.message.status === "success") {
                                SweetAlert.close();
                                $scope.fn.cancel();
                                //  이슈 상세 화면 요청
                                $rootScope.$broadcast("getIssueDetail", {
                                    id : parameter.id
@@ -908,7 +944,7 @@
                                SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "하위이슈 생성 실패"
                            }
                        });
                    });
                    }
                }

                //  팝업 창 닫기