- issue_company 테이블에 컬럼 추가 및 'tel' 컬럼 사이즈 변경 - 이슈 추가,수정 시 업체 추가된 항목들 추가 - 하...

이민희

2022-01-13 9f955be440cad5e6b868800ff0a0acd17c0a3004

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

@@ -37,7 +37,13 @@
                    setIssueTypeTemplate : setIssueTypeTemplate,    //  이슈 유형 템플릿 적용하기
                    startExecute : startExecute, //  컨트롤 로딩시 처음으로 시작되는 함수
                    containsPartner : containsPartner,
                    getPartners : getPartners
                    getPartners : getPartners,
                    getDepartments : getDepartments,
                    getCompanyTypeListCallBack : getCompanyTypeListCallBack,
                    getParentSectorListCallBack : getParentSectorListCallBack,
                    getChildSectorListCallBack : getChildSectorListCallBack,
                    getRegionListCallBack : getRegionListCallBack,
                    getStatusListCallBack : getStatusListCallBack,
                };

                $scope.vm = {
@@ -58,7 +64,18 @@
                        attachedFiles : [], //  섬머노트로 파일 업로드를 할 경우 서버에서 pk를 따고 issue id와 연동 작업이 필요하다.
                        startCompleteDateRange : "", //  시작일 ~ 종료일
                        detectingDateRange : "", //  탐지일
                        issueCustomFields : []  //  이슈에서 사용되는 사용자 정의 필드
                        issueCustomFields : [],  //  이슈에서 사용되는 사용자 정의 필드
                        issueStatusId: "",
                        companyTypeId : "",
                        companyType : "", //기업구분
                        parentSectorId : "",
                        parentSector : "", //업종(대분류)
                        childSectorId : "",
                        childSector : "", //업종(중분류)
                        regionId : "",
                        region : "", //지역
                        statusId : "",
                        status : "", //상태
                    },
                    infiniteAdd : false,    //  연속 생성
                    projectName : "",   //  프로젝트 명 검색
@@ -111,6 +128,26 @@
                        hostingField : {
                            page : 0,
                            totalPage : 0
                        },
                        companyType : {
                            page : 0,
                            totalPage : 0
                        },
                        parentSector : {
                            page : 0,
                            totalPage : 0
                        },
                        childSector : {
                            page : 0,
                            totalPage : 0
                        },
                        region : {
                            page : 0,
                            totalPage : 0
                        },
                        status : {
                            page : 0,
                            totalPage : 0
                        }
                    },
                    summerNote : {
@@ -121,6 +158,14 @@
                    priorities : [],    //  우선순위 정보
                    severities : [],    //  중요도 정보
                    fileTableConfigs : [],   //  파일 업로드 정보 테이블

                    typeCategory : {
                        companyType : "COMPANYTYPE",
                        parentSector : "PARENTSECTOR",
                        childSector : "CHILDSECTOR",
                        region : "REGION",
                        status : "STATUS"
                    },
                };

                // 연관 일감 관련
@@ -378,6 +423,31 @@
                    $scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
                }

                // 기업구분 autocomplete page 업데이트
                function getCompanyTypeListCallBack(result) {
                    $scope.vm.autoCompletePage.companyType.totalPage = result.data.page.totalPage;
                }

                // 업종(대분류) autocomplete page 업데이트
                function getParentSectorListCallBack(result) {
                    $scope.vm.autoCompletePage.parentSector.totalPage = result.data.page.totalPage;
                }

                // 업종(중분류) 카테고리 autocomplete page 업데이트
                function getChildSectorListCallBack(result) {
                    $scope.vm.autoCompletePage.childSector.totalPage = result.data.page.totalPage;
                }

                // 지역 카테고리 autocomplete page 업데이트
                function getRegionListCallBack(result) {
                    $scope.vm.autoCompletePage.region.totalPage = result.data.page.totalPage;
                }

                // 상태 카테고리 autocomplete page 업데이트
                function getStatusListCallBack(result) {
                    $scope.vm.autoCompletePage.status.totalPage = result.data.page.totalPage;
                }

                // 폼 체크
                function formCheck(formInvalid) {
                    if (formInvalid) {
@@ -398,6 +468,34 @@
                    $scope.vm.companyEmail = result[0].email;
                    $scope.vm.companyUrl = result[0].url;
                    $scope.vm.companyMemo = result[0].memo;
                    $scope.vm.form.companyTypeId = result[0].companyTypeId;
                    $scope.vm.form.parentSectorId = result[0].parentSectorId;
                    $scope.vm.form.childSectorId = result[0].childSectorId;
                    $scope.vm.form.regionId = result[0].regionId;
                    $scope.vm.form.statusId = result[0].statusId;
                    $scope.vm.form.companyType = result[0].companyTypeName;
                    $scope.vm.form.parentSector = result[0].parentSectorName;
                    $scope.vm.form.childSector = result[0].childSectorName;
                    $scope.vm.form.region = result[0].regionName;
                    $scope.vm.form.status = result[0].statusName;

                    $scope.vm.ispId = "";
                    $scope.vm.ispName = "";
                    $scope.vm.ispCode = "";
                    $scope.vm.ispManager = "";
                    $scope.vm.ispTel = "";
                    $scope.vm.ispEmail = "";
                    $scope.vm.ispUrl = "";
                    $scope.vm.ispMemo = "";

                    $scope.vm.hostingId = "";
                    $scope.vm.hostingName = "";
                    $scope.vm.hostingCode = "";
                    $scope.vm.hostingManager = "";
                    $scope.vm.hostingTel = "";
                    $scope.vm.hostingEmail = "";
                    $scope.vm.hostingUrl = "";
                    $scope.vm.hostingMemo = "";

                    if (ispFieldVo != null){
                        $scope.vm.ispId = ispFieldVo.id;
@@ -530,12 +628,10 @@

                            return attachedFileIds;
                        })(),

                        issueCompanyFields : (function () {
                            var issueCompanyFields = [];
                            if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0 ){
                                var companyField = $scope.vm.form.issueCompanyFields[0];

                                issueCompanyFields.push({
                                    companyId : $scope.vm.companyId,
                                    name : $scope.vm.companyName,
@@ -543,20 +639,66 @@
                                    tel : $scope.vm.companyTel,
                                    email :$scope.vm.companyEmail,
                                    url :$scope.vm.companyUrl,
                                    memo : $scope.vm.companyMemo
                                    memo : $scope.vm.companyMemo,
                                    companyTypeId : companyField.companyTypeId,
                                    parentSectorId : companyField.parentSectorId,
                                    childSectorId : companyField.childSectorId,
                                    regionId : companyField.regionId,
                                    statusId : companyField.statusId
                                });
                            }

                            return issueCompanyFields;
                        })(),
                        companyName : $scope.vm.companyName,
                        companyManager : $scope.vm.companyManager,
                        companyTel : $scope.vm.companyTel,
                        companyEmail :$scope.vm.companyEmail,
                        companyUrl :$scope.vm.companyUrl,
                        companyMemo : $scope.vm.companyMemo,
                        companyTypeId : (function () {
                            var companyTypeId = -1;
                            if ($scope.vm.form.companyTypes != null) {
                                companyTypeId = $scope.vm.form.companyTypes[0].id;
                            }
                            return companyTypeId;
                        })(),
                        parentSectorId : (function () {
                            var parentSectorId = -1;
                            if ($scope.vm.form.parentSectors != null) {
                                parentSectorId = $scope.vm.form.parentSectors[0].id;
                            }
                            return parentSectorId;
                        })(),
                        childSectorId : (function () {
                            var childSectorId = -1;
                            if ($scope.vm.form.childSectors != null) {
                                childSectorId = $scope.vm.form.childSectors[0].id;
                            }
                            return childSectorId;
                        })(),
                        regionId : (function () {
                            var regionId = -1;
                            if ($scope.vm.form.regions != null) {
                                regionId = $scope.vm.form.regions[0].id;
                            }
                            return regionId;
                        })(),
                        statusId : (function () {
                            var statusId = -1;
                            if ($scope.vm.form.statuses != null) {
                                statusId = $scope.vm.form.statuses[0].id;
                            } else if ($scope.vm.form.status !== ""){
                                statusId = 120; //직접입력 일 경우
                            }
                            return statusId;
                        })(),
                        statusName : $scope.vm.form.status,

                        issueIspFields : (function () {
                            var issueIspFields = [];
                            if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
                                && $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
                                || $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
                                var ispField = $scope.vm.form.issueIspFields[0];

                                issueIspFields.push({
                                    ispId : $scope.vm.ispId,
                                    name : $scope.vm.ispName,
@@ -567,19 +709,22 @@
                                    url :$scope.vm.ispUrl,
                                    memo : $scope.vm.ispMemo
                                });

                            }

                            return issueIspFields;
                        })(),
                        ispName : $scope.vm.ispName,
                        ispCode : $scope.vm.ispCode,
                        ispManager : $scope.vm.ispManager,
                        ispTel : $scope.vm.ispTel,
                        ispEmail :$scope.vm.ispEmail,
                        ispUrl :$scope.vm.ispUrl,
                        ispMemo : $scope.vm.ispMemo,

                        issueHostingFields : (function () {
                            var issueHostingFields = [];
                            if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
                                && $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
                                || $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
                                var hostingField = $scope.vm.form.issueHostingFields[0];

                                issueHostingFields[0] = {
                                    hostingId : $scope.vm.hostingId,
                                    name : $scope.vm.hostingName,
@@ -593,6 +738,13 @@
                            }
                            return issueHostingFields;
                        })(),
                        hostingName : $scope.vm.hostingName,
                        hostingCode : $scope.vm.hostingCode,
                        hostingManager : $scope.vm.hostingManager,
                        hostingTel : $scope.vm.hostingTel,
                        hostingEmail :$scope.vm.hostingEmail,
                        hostingUrl :$scope.vm.hostingUrl,
                        hostingMemo : $scope.vm.hostingMemo,

                        startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
                        detectingDateRange : $scope.vm.form.detectingDateRange,
@@ -632,6 +784,7 @@
                        fileFormDataName : "file"
                    }).then(function (result) {
                        if (result.data.message.status === "success") {

                            //  연속 등록 체크시 이동하지 않음.
                            if ($scope.vm.infiniteAdd) {
                                $scope.fn.infiniteAddForm();
@@ -640,7 +793,9 @@
                                $scope.fn.cancel();

                                if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
                                    $state.go("issues.list");
                                    $state.go($state.current, {}, {reload : true});
                                    // $state.go("issues.list");
                                    // $state.go("dashboards.dashboard")
                                }
                            }

@@ -834,6 +989,25 @@
                            $scope.vm.partnerVos = result.data.data;
                        }
                    });
                }

                function getDepartments() {
                    if($scope.vm.form.issueTypeId === ""){
                        $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
                    }
                    var content = {
                        issueTypeId : $scope.vm.form.issueTypeId,
                    };
                    Issue.findReadyDepartments($resourceProvider.getContent(
                        content,
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {
                        if (result.data.message.status === "success") {
                            angular.forEach(result.data.data, function (department) {
                                department.byName = department.departmentName;
                                $scope.vm.form.departments.push(department);
                            });
                        }
                    });

                }

@@ -844,7 +1018,8 @@
                        getIssueTypes : $scope.fn.getIssueTypes(),
                        getPriorities : $scope.fn.getPriorities(),
                        getSeverities : $scope.fn.getSeverities(),
                        getPartners : $scope.fn.getPartners()
                        getPartners : $scope.fn.getPartners(),
                        getDepartments : $scope.fn.getDepartments()
                    };
                    $q.all(promises).then(function (results) {
                        // 현재 프로젝트 설정