Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-11-18 f01dc01ba632addc8e893fea0843a3d77aac7e25

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

@@ -309,22 +309,25 @@
                function getProjectListCallBack(result) {
                    $scope.vm.autoCompletePage.project.totalPage = result.data.page.totalPage;
                }

                //  업체정보 autocomplete page 업데이트
                function getCompanyFieldListCallBack(result) {
                    $scope.vm.autoCompletePage.companyField.totalPage = result.data.page.totalPage;
                }

                // 부서정보 autocomplete page 업데이트
                function getIssueDepartmentListCallBack(result) {
                    $scope.vm.autoCompletePage.department.totalPage = result.data.page.totalPage;
                }

                // ISP정보 autocomplete page 업데이트
                function getIspFieldListCallBack(result) {
                    $scope.vm.autoCompletePage.ispField.totalPage = result.data.page.totalPage;

                }

                // 호스팅정보 autocomplete page 업데이트
                function getHostingFieldListCallBack(result) {
                    $scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;

                }

                // 폼 체크
@@ -337,6 +340,7 @@

                // 업체정보 결과 값 Event 처리(set)
                $scope.$on("companyFieldEvent", function (event, result) {
                    $scope.vm.companyId = result[0].id;
                    $scope.vm.companyManager = result[0].manager;
                    $scope.vm.companyTel = result[0].tel;
                    $scope.vm.companyEmail = result[0].email;
@@ -346,14 +350,17 @@

                // ISP정보 결과 값 Event 처리(set)
                $scope.$on("ispFieldEvent", function (event, result) {
                    $scope.vm.ispId = result[0].id;
                    $scope.vm.ispCode = result[0].code;
                    $scope.vm.ispManager = result[0].manager;
                    $scope.vm.ispTel = result[0].tel;
                    $scope.vm.ispEmail = result[0].email;
                    $scope.vm.ispMemo = result[0].memo;
                });

                // 호스팅정보 결과 값 Event 처리(set)
                $scope.$on("hostingFieldEvent", function (event, result) {
                    $scope.vm.hostingId = result[0].id;
                    $scope.vm.hostingCode = result[0].code;
                    $scope.vm.hostingManager = result[0].manager;
                    $scope.vm.hostingTel = result[0].tel;
@@ -382,30 +389,25 @@
                        severityId : $scope.vm.form.severityId,    //  중요도 아이디
                        companyId : (function () {   //  프로젝트 아이디
                            var companyId = "";

                            if ($scope.vm.form.companyFields.length > 0) {
                                companyId = $scope.vm.form.companyFields[0].id;
                            }

                            return companyId;
                        })(),

                        ispId : (function () {
                            var ispId = "";

                            if ($scope.vm.form.ispFields.length > 0) {
                                ispId = $scope.vm.form.ispFields[0].id;
                            }

                            return ispId;
                        })(),

                        hostingId : (function () {
                            var hostingId = "";

                            if ($scope.vm.form.hostingFields.length > 0) {
                                hostingId = $scope.vm.form.hostingFields[0].id;
                            }

                            return hostingId;
                        })(),

@@ -422,12 +424,13 @@
                        departmentIds : (function () {
                            var departmentIds = [];

                            angular.forEach($scope.vm.form.departments, function (user) {
                                departmentIds.push(user.id);
                            angular.forEach($scope.vm.form.departments, function (department) {
                                departmentIds.push(department.id);
                            });

                            return departmentIds;
                        })(),

                        attachedFileIds : (function () {
                            var attachedFileIds = [];

@@ -439,9 +442,43 @@

                            return attachedFileIds;
                        })(),

                        startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
                        detectingDateRange : $scope.vm.form.detectingDateRange,

                        issueCompanyFields : (function () {
                            var companyFields = [];

                            var  companyField = $scope.vm.form.companyFields[0];
                            companyField.companyId = companyField.id;
                            companyField.id = null;
                            companyFields.push(companyField);

                            return companyFields;
                        })(),

                        issueIspFields : (function () {
                            var ispFields = [];

                            var  ispField = $scope.vm.form.ispFields[0];
                            ispField.ispId = ispField.id;
                            ispField.id = null;
                            ispFields.push(ispField);

                            return ispFields;
                        })(),

                        issueHostingFields : (function () {
                            var hostingFields = [];

                            var  hostingField = $scope.vm.form.hostingFields[0];
                            hostingField.hostingId = hostingField.id;
                            hostingField.id = null;
                            hostingFields.push(hostingField);

                            return hostingFields;
                        })(),

                        issueCustomFields : (function () {    //  이슈에서 사용되는 사용자 정의 필드
                            var issueCustomFields = [];