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

이민희

2021-12-28 0f59a76b263ba6cd79380a729f38bfca92a907dd

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

@@ -408,6 +408,33 @@
                                .setColumnTooltip("미완료 하위이슈/전체 하위이슈")
                                .setDRenderer("DOWN_ISSUE_COUNT"));
                            break;
                        case "COMPANY" :   //  업체
                            $scope.vm.tableConfigs.push($tableProvider.config()
                                .setHName("common.company")
                                .setDName("companyName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("USE_COMPANY"));
                            break;
                        case "ISP" :   //  ISP
                            $scope.vm.tableConfigs.push($tableProvider.config()
                                .setHName("common.isp")
                                .setDName("ispName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("USE_ISP"));
                            break;
                        case "HOSTING" :   //  HOSTING
                            $scope.vm.tableConfigs.push($tableProvider.config()
                                .setHName("common.hosting")
                                .setDName("hostingName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("USE_HOSTING"));
                            break;
                    }

                    //  사용자 정의 필드 컬럼
@@ -582,6 +609,7 @@
                    }

                    return conditions;

                }

                function getTreeList() {
@@ -1079,13 +1107,16 @@
                    var deferred = $q.defer();
                    $scope.vm.partners = [];

                    Issue.findPartners($resourceProvider.getContent({},
                    Issue.findPartners($resourceProvider.getContent({issueTypeId : $rootScope.getCurrentIssueTypeId()},
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {
                        if (result.data.message.status === "success") {
                            $scope.vm.partnerVos = result.data.content;
                            angular.forEach(result.data.data, function (partner) {
                                $scope.vm.partners.push(partner);
                            });
                            //$scope.vm.partnerVos = result.data.data;
                        }
                        else {
                            SweetAlert.swal($filter("translate")("issue.failedToPriorityListLookup"), result.data.message.message, "error"); // 우선순위 목록 조회 실패
                            SweetAlert.swal($filter("translate")("issue.failedToPartnerListLookup"), result.data.message.message, "error"); // 파트너 목록 조회 실패
                        }

                        deferred.resolve(result.data.data);
@@ -1171,7 +1202,6 @@
                                        break;

                                }

                                $scope.vm.customFields.push(customField);
                            });
                        }
@@ -1192,8 +1222,8 @@

                    if ($rootScope.issueTypeMenu != null){
                        var content = {
                            issueTypeId : $rootScope.issueTypeMenu.id
                            }
                            issueTypeId : $rootScope.getCurrentIssueTypeId()
                        }

                        IssueTableConfig.detail($resourceProvider.getContent(content,
                            $resourceProvider.getPageContent(0, 1000))).then(function (result) {
@@ -1285,7 +1315,7 @@
                        getPriorities : $scope.fn.getPriorities(),
                        getSeverities : $scope.fn.getSeverities(),
                        getIssueStatuses : $scope.fn.getIssueStatuses(),
                        getCustomFields : $scope.fn.getCustomFields()
                        getCustomFields : $scope.fn.getCustomFields(),
                    };

                    $q.all(promises).then(function (results){