From d2d33c7634f26a2cfbda6768059ae242c1866773 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 15 2월 2022 17:47:15 +0900
Subject: [PATCH] - 업체(대분류,중분류) 간헐적으로 초기화 안되는 문제 해결

---
 src/main/webapp/scripts/components/utils/autoComplete.controller.js |  368 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 358 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index cdb0fce..ea0e0b5 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -23,6 +23,9 @@
                 var IspField = $injector.get("IspField");
                 var HostingField = $injector.get("HostingField");
                 var IssueType = $injector.get("IssueType");
+                var IssueTypeCustomField = $injector.get("IssueTypeCustomField");
+                var CustomField = $injector.get("CustomField");
+                var CompanyFieldCategory = $injector.get("CompanyFieldCategory");
                 var $log = $injector.get("$log");
                 var SweetAlert = $injector.get("SweetAlert");
 
@@ -30,6 +33,9 @@
                 $scope.fn.getUserList = getUserList;    //  �궗�슜�옄 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
                 $scope.fn.getProjectList = getProjectList;  //  �봽濡쒖젥�듃 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
                 $scope.fn.getIssueList = getIssueList;  //  �씪媛� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+                $scope.fn.getParentIssueList = getParentIssueList;   // �긽�쐞 �씠�뒋 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+                $scope.fn.getRelIssueList = getRelIssueList;   // �뿰愿� �씠�뒋 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+                $scope.fn.getDownIssueList = getDownIssueList;  //  �븯�쐞 �씠�뒋 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
                 $scope.fn.getWorkflowList = getWorkflowList;    //  �썙�겕�뵆濡쒖슦 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
                 $scope.fn.getUserDepartmentList = getUserDepartmentList;    //  遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
                 $scope.fn.getIssueCompanyFieldList = getIssueCompanyFieldList;    //  �뾽泥� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
@@ -38,6 +44,11 @@
                 $scope.fn.getIssueHostingFieldList = getIssueHostingFieldList;    //  �샇�뒪�똿 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
                 $scope.fn.getPartnerList = getPartnerList;          // �뾽泥�/isp/�샇�뒪�똿 紐⑸줉 議고쉶
                 $scope.fn.getIssueTypeList = getIssueTypeList;          // �씠�뒋 �쑀�삎 紐⑸줉 議고쉶
+                $scope.fn.getCustomFieldList = getCustomFieldList;          // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶
+                $scope.fn.getMailTargetAll = getMailTargetAll;          // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶
+                $scope.fn.getIssueTypeCustomFieldList = getIssueTypeCustomFieldList;      // �씠�뒋 �쑀�삎�뿉�꽌 �궗�슜以묒씤 �궗�슜�옄�젙�쓽 �븘�뱶媛��졇�삤湲�
+                $scope.fn.getCompanyTypeCategory = getCompanyTypeCategory;    //  �뾽泥� 移댄뀒怨좊━ 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+                $scope.fn.getCompanyChildSector = getCompanyChildSector;    //  �뾽泥� 移댄뀒怨좊━ 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
 
                 function getUserList(query, excludeList, page, callBack) {
                     var conditions = {
@@ -62,7 +73,8 @@
                             });
 
                             return excludeIds;
-                        })()
+                        })(),
+                        issueId : $rootScope.currentDetailIssueId
                     };
 
                     var deferred = $q.defer();
@@ -123,9 +135,16 @@
                     return deferred.promise;
                 }
 
-                function getIssueList(query, excludeList, page, callBack) {
+                function getIssueList(query, issueTypeId, excludeList, page, callBack) {
                     var conditions = {
                         name : query,
+                        /*issueTypeIds : (function () {
+                            var ids = [];
+
+                            ids.push(issueTypeId);
+
+                            return ids;
+                        })(),*/
                         excludeIds : (function () {
                             var excludeIds = [];
 
@@ -154,6 +173,134 @@
                         }
                     });
 
+                    return deferred.promise;
+                }
+
+                function getParentIssueList(query, issueTypeId, excludeList, page, callBack) {
+                    var conditions = {
+                        name : query,
+                        excludeIds : (function () {
+                            var excludeIds = [];
+
+                            angular.forEach(excludeList, function (exclude) {
+                                excludeIds.push(exclude.id);
+                            });
+                            return excludeIds;
+                        })()
+                    };
+
+                    var deferred = $q.defer();
+
+                    if ($rootScope.isDefined(page) && page > 0) {
+                        $rootScope.spinner = true;
+                    }
+
+                    Issue.find($resourceProvider.getContent(
+                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
+                        if (result.data.message.status === "success") {
+                            if ($rootScope.isDefined(callBack)) {
+                                callBack(result);
+                            }
+                            deferred.resolve(result.data.data);
+                        }
+                        else {
+                            SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), result.data.message.message, "error"); // "�썙�겕�뵆濡쒖슦 紐⑸줉 議고쉶 �떎�뙣"
+                        }
+                        $rootScope.spinner = false;
+                    });
+                    return deferred.promise;
+                }
+
+                function getRelIssueList(parentYN, project, query, issueTypeId, excludeList, page, callBack) {
+                    var conditions = {
+                        name : query,
+                        excludeIds : (function () {
+                            var excludeIds = [];
+
+                            angular.forEach(excludeList, function (exclude) {
+                                excludeIds.push(exclude.id);
+                            });
+                            return excludeIds;
+                        })(),
+                        parentYN : parentYN,
+                        projectIds : (function () {
+                            var projectIds = [];
+                            if (project != null) {
+                                if (project.length < 1) {
+                                    SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), $filter("translate")("common.selectToProjectListLookUp"), "error"); // "�봽濡쒖젥�듃瑜� 癒쇱� �꽑�깮 �빐 二쇱꽭�슂."
+                                }
+                                if ($rootScope.isDefined(project[0])) {
+                                    projectIds.push(project[0].id);
+                                }
+                            }
+                            return projectIds;
+                        })()
+                    };
+
+                    var deferred = $q.defer();
+
+                    if ($rootScope.isDefined(page) && page > 0) {
+                        $rootScope.spinner = true;
+                    }
+
+                    Issue.find($resourceProvider.getContent(
+                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
+                        if (result.data.message.status === "success") {
+                            if ($rootScope.isDefined(callBack)) {
+                                callBack(result);
+                            }
+                            deferred.resolve(result.data.data);
+                        }
+                        else {
+                            SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), result.data.message.message, "error"); // "�썙�겕�뵆濡쒖슦 紐⑸줉 議고쉶 �떎�뙣"
+                        }
+                        $rootScope.spinner = false;
+                    });
+                    return deferred.promise;
+                }
+
+                function getDownIssueList(query, issueTypeId, parentIssueId, excludeList, page, callBack) {
+                    var conditions = {
+                        name : query,
+                        issueTypeIds : (function () {
+                            var ids = [];
+
+                            ids.push(issueTypeId);
+
+                            return ids;
+                        })(),
+                        excludeIds : (function () {
+                            var excludeIds = [];
+
+                            angular.forEach(excludeList, function (exclude) {
+                                excludeIds.push(exclude.id);
+                            });
+
+                            if(parentIssueId != null) {
+                                excludeIds.push(parentIssueId);
+                            }
+                            return excludeIds;
+                        })()
+                    };
+                    var deferred = $q.defer();
+
+                    if ($rootScope.isDefined(page) && page > 0) {
+                        $rootScope.spinner = true;
+                    }
+
+                    Issue.find($resourceProvider.getContent(         //  �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
+                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
+                        if (result.data.message.status === "success") {
+                            if ($rootScope.isDefined(callBack)) {
+                                callBack(result);
+                            }
+                            deferred.resolve(result.data.data);
+                        }
+                        else {
+                            SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), result.data.message.message, "error"); // "�썙�겕�뵆濡쒖슦 紐⑸줉 議고쉶 �떎�뙣"
+                        }
+                        $rootScope.spinner = false;
+                    });
                     return deferred.promise;
                 }
 
@@ -223,7 +370,7 @@
 
                 function getIssueCompanyFieldList(query, excludeList, page, callBack) {
                     var conditions = {
-                        companyName : query,
+                        name : query,
                         excludeIds : (function () {
                             var excludeIds = [];
 
@@ -240,7 +387,7 @@
 
 
                     CompanyField.find($resourceProvider.getContent(         //  �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
-                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
+                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 100 : 1000))).then(function (result) {
                         if (result.data.message.status === "success") {
                             if ($rootScope.isDefined(callBack)) {
                                 callBack(result);
@@ -256,8 +403,10 @@
                     return deferred.promise;
                 }
 
-                function getIssueDepartmentList(query, excludeList, page, callBack) {
+                function getIssueDepartmentList(issueTypeId, query, excludeList, page, callBack) {
                     var conditions = {
+                        //issueTypeId : $scope.vm.form.issueTypeId,
+                        issueTypeId : Number(issueTypeId),
                         departmentName : query,
                         userId : $rootScope.user.id,
                         projectId : (function () {
@@ -289,11 +438,19 @@
                     UserWorkspace.findProjectDepartment($resourceProvider.getContent(         //  �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
                         conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
                         if (result.data.message.status === "success") {
+                            const departments = result.data.data;
+                            if(departments != null){
+                                var filterDepartments = departments.filter(function(item, idx){
+                                    return departments.findIndex(function(item2, idx2){
+                                        return item.departmentName === item2.departmentName
+                                    }) == idx;
+                                });
+                            }
+
                             if ($rootScope.isDefined(callBack)) {
                                 callBack(result);
                             }
-
-                            deferred.resolve(result.data.data);
+                            deferred.resolve(filterDepartments);
                         }
                         else {
                             SweetAlert.swal($filter("translate")("common.failedToProjectListLookUp"), result.data.message.message, "error"); // "�봽濡쒖젥�듃 紐⑸줉 議고쉶 �떎�뙣"
@@ -305,7 +462,7 @@
 
                 function getIssueIspFieldList(query, excludeList, page, callBack) {
                     var conditions = {
-                        ispName : query,
+                        name : query,
                         excludeIds : (function () {
                             var excludeIds = [];
 
@@ -320,7 +477,7 @@
                     var deferred = $q.defer();
 
                     IspField.find($resourceProvider.getContent(         //  �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
-                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
+                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 100 : 1000))).then(function (result) {
                         if (result.data.message.status === "success") {
                             if ($rootScope.isDefined(callBack)) {
                                 callBack(result);
@@ -338,7 +495,7 @@
 
                 function getIssueHostingFieldList(query, excludeList, page, callBack) {
                     var conditions = {
-                        hostingName : query,
+                        name : query,
                         excludeIds : (function () {
                             var excludeIds = [];
 
@@ -365,6 +522,91 @@
                         else {
                             SweetAlert.swal($filter("translate")("common.failedToProjectListLookUp"), result.data.message.message, "error"); // "�봽濡쒖젥�듃 紐⑸줉 議고쉶 �떎�뙣"
                         }
+                    });
+
+                    return deferred.promise;
+                }
+
+                function getCompanyTypeCategory(typeCategory, query, excludeList, page, callBack) {
+                    var conditions = {
+                        typeCategory : typeCategory,
+                        useValue : query,
+                        excludeIds : (function () {
+                            var excludeIds = [];
+
+                            angular.forEach(excludeList, function (exclude) {
+                                excludeIds.push(exclude.id);
+                            });
+
+                            return excludeIds;
+                        })()
+                    };
+
+                    var deferred = $q.defer();
+
+                    if ($rootScope.isDefined(page) && page > 0) {
+                        $rootScope.spinner = true;
+                    }
+
+                    CompanyFieldCategory.find($resourceProvider.getContent(         //  �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
+                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 100 : 1000))).then(function (result) {
+                        if (result.data.message.status === "success") {
+                            if ($rootScope.isDefined(callBack)) {
+                                callBack(result, query);
+                            }
+                            deferred.resolve(result.data.data);
+                        }
+                        else {
+                            SweetAlert.swal($filter("translate")("common.failedToCompanyCategoryListLookUp"), result.data.message.message, "error");
+                        }
+                        $rootScope.spinner = false;
+                    });
+
+                    return deferred.promise;
+                }
+
+                function getCompanyChildSector(parentSector, parentSectorId, typeCategory, query, excludeList, page, callBack) {
+                    var conditions = {
+                        parentId : (function () {   // �뾽醫�(��遺꾨쪟)
+                            var parentId = "";
+                            if (parentSector != null && parentSector !== "") {
+                                parentId = parentSector;
+                            }else {
+                                parentId = parentSectorId;
+                            }
+                            return parentId;
+                        })(),
+                        typeCategory : typeCategory,
+                        useValue : query,
+                        excludeIds : (function () {
+                            var excludeIds = [];
+
+                            angular.forEach(excludeList, function (exclude) {
+                                excludeIds.push(exclude.id);
+                            });
+
+                            return excludeIds;
+                        })()
+                    };
+
+                    var deferred = $q.defer();
+
+                    if ($rootScope.isDefined(page) && page > 0) {
+                        $rootScope.spinner = true;
+                    }
+
+                    CompanyFieldCategory.find($resourceProvider.getContent(         //  �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
+                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 100 : 1000))).then(function (result) {
+                        if (result.data.message.status === "success") {
+                            if ($rootScope.isDefined(callBack)) {
+                                callBack(result);
+                            }
+                            deferred.resolve(result.data.data);
+                        }
+                        else {
+                            SweetAlert.swal($filter("translate")("common.failedToCompanyCategoryListLookUp"), result.data.message.message, "error");
+                        }
+                        $rootScope.spinner = false;
                     });
 
                     return deferred.promise;
@@ -403,6 +645,40 @@
                     return deferred.promise;
                 }
 
+                function getCustomFieldList(query, excludeList, page, callBack) {
+                    var conditions = {
+                        name : query,
+                        excludeIds : (function () {
+                            var excludeIds = [];
+
+                            angular.forEach(excludeList, function (exclude) {
+                                excludeIds.push(exclude.id);
+                            });
+
+                            return excludeIds;
+                        })()
+                    };
+
+                    var deferred = $q.defer();
+
+                    CustomField.find($resourceProvider.getContent(         //  �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
+                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
+                        if (result.data.message.status === "success") {
+
+                            if ($rootScope.isDefined(callBack)) {
+                                callBack(result);
+                            }
+
+                            deferred.resolve(result.data.data);
+                        }
+                        else {
+                            SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
+                        }
+                    });
+
+                    return deferred.promise;
+                }
+
                 function getIssueTypeList(query, excludeList, page, callBack) {
                     var conditions = {
                         name : query,
@@ -436,6 +712,78 @@
 
                     return deferred.promise;
                 }
+
+                //  �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶
+                function getIssueTypeCustomFieldList(query, excludeList, projectId, issueTypeId, page, callBack) {
+
+                    if (projectId == null) return;
+                    if (issueTypeId == null) return;
+
+                    var deferred = $q.defer();
+
+                    IssueTypeCustomField.find($resourceProvider.getContent({
+                            name : query,
+                            projectId : projectId,
+                            issueTypeId : issueTypeId,
+                            excludeIds : (function () {
+                                var excludeIds = [];
+
+                                angular.forEach(excludeList, function (exclude) {
+                                    excludeIds.push(exclude.id);
+                                });
+
+                                return excludeIds;
+                            })()
+                        },
+                        $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+                        if (result.data.message.status === "success") {
+                            if ($rootScope.isDefined(callBack)) {
+                                callBack(result);
+                            }
+
+                            var customFields = result.data.data;
+                            var customFieldVos = [];
+                            customFields.forEach(function (customField) {
+                                customFieldVos.push(customField.customFieldVo);
+                            })
+
+                            deferred.resolve(customFieldVos);
+                        }
+                        else {
+                            SweetAlert.swal($filter("translate")("issue.failedToUserDefinedFieldListAssociatedLookup"), result.data.message.message, "error"); // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶 �떎�뙣
+                        }
+
+                    });
+
+                    return deferred.promise;
+                }
+
+                function getMailTargetAll(excludeList) {
+                    var deferred = $q.defer();
+
+                    var partners = $scope.vm.partners.slice();
+                    if (excludeList != null && excludeList.id.length > 0) {
+                        var filterData = excludeList.id.filter(function(item, idx){
+                            return excludeList.id.findIndex(function(item2, idx2){
+                                return item === item2
+                            }) == idx;
+                        });
+                        for (let i = partners.length - 1 ; i >= 0 ; i--) {
+                            filterData.forEach(function (exclude) {
+                                if (partners[i] != null && partners[i].id === exclude) {
+                                    partners.splice(i, 1);
+                                    if (partners[i] == null) {
+                                        return false;
+                                    }
+                                }
+                            });
+                        }
+                    }
+
+                    deferred.resolve(partners);
+
+                    return deferred.promise;
+                }
             }
         ]);
     }

--
Gitblit v1.8.0