이슈(추가,수정)충돌 수정

이민희

2021-11-29 12ee57fe168d76d8a71993a1473dba8b20d49ab9

이슈(추가,수정)충돌 수정

 src/main/java/kr/wisestone/owl/web/controller/IssueController.java

@@ -63,7 +63,7 @@
        return this.setSuccessMessage(resJsonData);
    }

    //  이슈 조회
    //  파트너 목록 조회
    @RequestMapping(value = "/issue/findPartner", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
    public
    @ResponseBody

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

@@ -9,9 +9,9 @@
    ],
    function (app, angular) {
        app.controller('issueAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', '$uibModal', '$injector',
            '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'Issue', 'User', 'AttachedFile', 'IssueType', 'HostingField', 'Priority', 'Severity', 'IssueTypeCustomField', '$filter', '$state',
            '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'Issue', 'User', 'AttachedFile', 'IssueType', 'Priority', 'Severity', 'IssueTypeCustomField', '$filter', '$state',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, $uibModal,  $injector, $controller, $tableProvider, SweetAlert, $timeout,
                      $stateParams, $q, Issue, User, AttachedFile, IssueType, HostingField, Priority, Severity, IssueTypeCustomField, $filter, $state) {
                      $stateParams, $q, Issue, User, AttachedFile, IssueType, Priority, Severity, IssueTypeCustomField, $filter, $state) {

                $scope.fn = {
                    cancel : cancel,    //  팝업 창 닫기
@@ -37,7 +37,7 @@
                    setIssueTypeTemplate : setIssueTypeTemplate,    //  이슈 유형 템플릿 적용하기
                    startExecute : startExecute, //  컨트롤 로딩시 처음으로 시작되는 함수
                    containsPartner : containsPartner,
                    getPartners : getPartners,
                    getPartners : getPartners
                };

                $scope.vm = {
@@ -320,8 +320,8 @@
                function containsPartner(name) {
                    var result = false;

                    if ($scope.vm.viewer.usePartnerVo != null) {
                        $scope.vm.viewer.usePartnerVo.forEach(function (partnerVo) {
                    if ($scope.vm.partnerVos != null) {
                        $scope.vm.partnerVos.forEach(function (partnerVo) {
                            if (name === partnerVo.name) {
                                result = true;
                            }
@@ -578,27 +578,27 @@
                        },
                        fileFormDataName : "file"
                    }).then(function (result) {
                            if (result.data.message.status === "success") {
                                //  연속 등록 체크시 이동하지 않음.
                                if ($scope.vm.infiniteAdd) {
                                    $scope.fn.infiniteAddForm();
                                }
                                else {
                                    $scope.fn.cancel();

                                    if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
                                        $state.go("issues.list");
                                    }
                                }

                                $rootScope.$broadcast("getIssueList", {});
                        if (result.data.message.status === "success") {
                            //  연속 등록 체크시 이동하지 않음.
                            if ($scope.vm.infiniteAdd) {
                                $scope.fn.infiniteAddForm();
                            }
                            else {
                                SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // 이슈 등록 실패
                                $scope.fn.cancel();

                                if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
                                    $state.go("issues.list");
                                }
                            }

                            $rootScope.spinner = false;
                        });
                            $rootScope.$broadcast("getIssueList", {});
                        }
                        else {
                            SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // 이슈 등록 실패
                        }

                        $rootScope.spinner = false;
                    });
                }

                //  팝업 창 닫기
@@ -648,22 +648,6 @@

                    return deferred.promise;
                }

                // 업체/ISP/호스팅 이름이 포함 여부 확인
                function containsPartner(name) {
                    var result = false;

                    if ($scope.vm.partnerVos != null) {
                        $scope.vm.partnerVos.forEach(function (partnerVo) {
                            if (name === partnerVo.name) {
                                result = true;
                            }
                        });
                    }
                    return result;

                }


                //  중요도 목록
                function getSeverities() {
@@ -777,7 +761,6 @@
                    }
                }


                function getPartners() {
                    var content = {
                        issueTypeId : $scope.vm.form.issueTypeId
@@ -816,4 +799,4 @@

                $scope.fn.startExecute();
            }]);
    });
    });

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

@@ -144,8 +144,7 @@
                });

                $scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) {

                     $scope.vm.partnerVos = $scope.fn.getPartners();
                    $scope.vm.partnerVos = $scope.fn.getPartners();
                });


@@ -170,9 +169,9 @@
                }

                //  담당자 삭제
                 function removeManager(index) {
                     $scope.vm.form.users.splice(index, 1);
                 }
                function removeManager(index) {
                    $scope.vm.form.users.splice(index, 1);
                }

                // 담당부서 삭제
                function removeDepartment(index) {
@@ -916,6 +915,7 @@
                    var promises = {
                        detail : $scope.fn.detail(),
                        getIssueTypes : $scope.fn.getIssueTypes(),
                        getPriorities : $scope.fn.getPriorities(),
                        getSeverities : $scope.fn.getSeverities(),
                        getPartners : $scope.fn.getPartners()
                    };
@@ -927,4 +927,4 @@

                $scope.fn.startExecute();
            }]);
    });
    });