이슈 테이블 설정 오류 해결

이민희

2022-01-13 303d80b28240177fdb813872d00fad757cd650d4

이슈 테이블 설정 오류 해결

 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java

@@ -1521,7 +1521,7 @@

                case "02": //  프로젝트, 이슈 유형, 이슈 상태,  우선순위, 중요도, 담당자, 첨부파일, 사용자 정의 필드 정보, 댓글, 기록을 셋팅한다.
                    this.setIssueDetail(issueVo, issue, user);    //  이슈 상세 정보를 셋팅한다.
                    this.setIssueTableConfigs(issue, issueVo);
                    this.setIssueTableConfigs(issue, issueVo, issueCondition);
                    issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
                    break;
            }
@@ -1533,8 +1533,9 @@
    }

    // 테이블 설정 셋팅
    private void setIssueTableConfigs(Issue issue, IssueVo issueVo) {
        Long IssueTypeId = issue.getIssueType().getId();
    private void setIssueTableConfigs(Issue issue, IssueVo issueVo, IssueCondition issueCondition) {
        //Long IssueTypeId = issue.getIssueType().getId();
        Long IssueTypeId = issueCondition.getIssueTypeId();

        for (int tableConfigType : IssueTableConfig.IssueTableTypes) {
            if (tableConfigType != IssueTableConfig.ISSUE_TABLE_TYPE_MAIN) {

 src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java

@@ -90,14 +90,8 @@
    @Override
    @Transactional(readOnly = true)
    public IssueTableConfig findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(Long issueTypeId, int issueTableType) {
        List<IssueTableConfig> issueTableConfigList = null;
        if (issueTypeId != null) {
            issueTableConfigList = this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(this.webAppUtil.getLoginId(),
        List<IssueTableConfig> issueTableConfigList = this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(this.webAppUtil.getLoginId(),
                    this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueTypeId, issueTableType);
        } else {
            issueTableConfigList = this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueTableType(this.webAppUtil.getLoginId(),
                    this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueTableType);
        }

        if (issueTableConfigList != null && issueTableConfigList.size() > 0) {
            return  issueTableConfigList.get(0);

 src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java

@@ -58,6 +58,7 @@
    private Pageable relPageable;
    private Pageable downPageable;
    private Boolean allIssue; // 전체이슈 보여주기
    private Long issueTypeId;

    public IssueCondition(){}

@@ -168,6 +169,10 @@

        if (MapUtil.getLongs(conditions, "issueTypeIds") != null) {
            condition.setIssueTypeIds(MapUtil.getLongs(conditions, "issueTypeIds"));
        }

        if (MapUtil.getLong(conditions, "issueTypeId") != null) {
            condition.setIssueTypeId(MapUtil.getLong(conditions, "issueTypeId"));
        }

        if (MapUtil.getLongs(conditions, "priorityIds") != null) {
@@ -582,4 +587,12 @@
    public void setAllIssue(Boolean allIssue) {
        this.allIssue = allIssue;
    }

    public Long getIssueTypeId() {
        return issueTypeId;
    }

    public void setIssueTypeId(Long issueTypeId) {
        this.issueTypeId = issueTypeId;
    }
}

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

@@ -8,14 +8,15 @@
        'angular'
    ],
    function (app, angular) {
        app.controller('issueAddDownTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'IssueTypeCustomField', '$q', '$filter', 'parameter',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, IssueTypeCustomField, $q, $filter, parameter) {
        app.controller('issueAddDownTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'Issue', 'IssueTableConfig', 'IssueTypeCustomField', '$q', '$filter', 'parameter',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, Issue, IssueTableConfig, IssueTypeCustomField, $q, $filter, parameter) {

                //  함수 모음
                $scope.fn = {
                    cancel : cancel,    //  팝업 창 닫기
                    formSubmit : formSubmit,    //  폼 전송
                    formCheck : formCheck,  //  폼 체크
                    getUsePartner : getUsePartner,
                    getCustomFields : getCustomFields,   //  사용자 정의 필드 목록을 가져온다.
                    getDownIssueTableConfigs : getDownIssueTableConfigs //  이슈 목록 테이블 설정 정보를 가져온다.
                };
@@ -97,7 +98,15 @@
                    $rootScope.spinner = true;

                    var content = {
                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
                        issueTypeId : (function () {
                            var id = "";
                            if ($rootScope.allIssueList) {
                                id = -1;
                            } else {
                                id = $rootScope.getCurrentIssueTypeId();
                            }
                            return id;
                        })(),
                        issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
                    };

@@ -116,6 +125,24 @@
                            SweetAlert.error($filter("translate")("issue.failedToSaveIssueTableSetting"), result.data.message.message); // 이슈 테이블 설정 저장 실패
                        }
                    });
                }

                //  이슈유형 별 파트너 목록
                function getUsePartner() {
                    var deferred = $q.defer();
                    $scope.vm.partners = [];

                    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.data;
                        }
                        else {
                            SweetAlert.swal($filter("translate")("issue.failedToPartnerListLookup"), result.data.message.message, "error"); // 파트너 목록 조회 실패
                        }
                        deferred.resolve(result.data.data);
                    });
                    return deferred.promise;
                }


@@ -149,7 +176,15 @@
                    var content = {
                        issueId : $rootScope.currentDetailIssueId,
                        //delValue : $scope.vm.issueDownTableConfigs.splice(8,1),
                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
                        issueTypeId : (function () {
                            var id = "";
                            if ($rootScope.allIssueList) {
                                id = -1;
                            } else {
                                id = $rootScope.getCurrentIssueTypeId();
                            }
                            return id;
                        })(),
                        issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
                    };

@@ -165,47 +200,69 @@
                    return deferred.promise;
                }

                //  사용자 정의 필드를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                $scope.fn.getCustomFields().then(function (result) {
                //  파트너를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                $scope.fn.getUsePartner().then(function (result) {
                    var count = 8;
                    angular.forEach(result, function (customField) {
                    angular.forEach(result, function (partner) {
                        $scope.vm.issueDownTableConfigs.push({
                            name : customField.name,
                            key : "CUSTOM_FIELD_" + customField.id,
                            name : partner.name,
                            key : (function () {
                                var key = "";
                                if (partner.name === "업체") {
                                    key = "DOWN_COMPANY";
                                } else if(partner.name === "ISP") {
                                    key = "DOWN_ISP";
                                } else {
                                    key = "DOWN_HOSTING";
                                }
                                return key;
                            })(),
                            width : "width-100-p",
                            display : false,
                            checkboxShow : true,
                            position : count
                        });

                        count++;
                    });

                    //  이슈 목록 테이블 설정 정보를 가져온다.
                    $scope.fn.getDownIssueTableConfigs().then(function (issueTableConfigs) {
                        if ($rootScope.isDefined(issueTableConfigs)) {
                            $rootScope.spinner = true;

                            var saveTableConfigs = JSON.parse(issueTableConfigs);

                            angular.forEach(saveTableConfigs, function (saveTableConfig) {

                                for (var count in $scope.vm.issueDownTableConfigs) {
                                    var issueTableConfig = $scope.vm.issueDownTableConfigs[count];

                                    if (issueTableConfig.key === saveTableConfig.key) {
                                        issueTableConfig.display = saveTableConfig.display;
                                        issueTableConfig.width = saveTableConfig.width;
                                        issueTableConfig.position = saveTableConfig.position;
                                        break;
                                    }
                                }
                    //  사용자 정의 필드를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                    $scope.fn.getCustomFields().then(function (result) {
                        angular.forEach(result, function (customField) {
                            $scope.vm.issueDownTableConfigs.push({
                                name : customField.name,
                                key : "CUSTOM_FIELD_" + customField.id,
                                width : "width-100-p",
                                display : false,
                                checkboxShow : true,
                                position : count
                            });
                            count++;
                        });

                            $rootScope.spinner = false;
                        }
                        //  이슈 목록 테이블 설정 정보를 가져온다.
                        $scope.fn.getDownIssueTableConfigs().then(function (issueTableConfigs) {
                            if ($rootScope.isDefined(issueTableConfigs)) {
                                $rootScope.spinner = true;

                                var saveTableConfigs = JSON.parse(issueTableConfigs);

                                angular.forEach(saveTableConfigs, function (saveTableConfig) {

                                    for (var count in $scope.vm.issueDownTableConfigs) {
                                        var issueTableConfig = $scope.vm.issueDownTableConfigs[count];

                                        if (issueTableConfig.key === saveTableConfig.key) {
                                            issueTableConfig.display = saveTableConfig.display;
                                            issueTableConfig.width = saveTableConfig.width;
                                            issueTableConfig.position = saveTableConfig.position;
                                            break;
                                        }
                                    }
                                });

                                $rootScope.spinner = false;
                            }
                        });
                    });
                });

            }]);
    });

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

@@ -8,8 +8,8 @@
        'angular'
    ],
    function (app, angular) {
        app.controller('issueAddRelationTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'IssueTypeCustomField', '$q', '$filter', 'parameter',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, IssueTypeCustomField, $q, $filter, parameter) {
        app.controller('issueAddRelationTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'Issue', 'IssueTypeCustomField', '$q', '$filter', 'parameter',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, Issue, IssueTypeCustomField, $q, $filter, parameter) {


                //  함수 모음
@@ -17,6 +17,7 @@
                    cancel : cancel,    //  팝업 창 닫기
                    formSubmit : formSubmit,    //  폼 전송
                    formCheck : formCheck,  //  폼 체크
                    getUsePartner : getUsePartner,
                    getCustomFields : getCustomFields,   //  사용자 정의 필드 목록을 가져온다.
                    getRelIssueTableConfigs : getRelIssueTableConfigs //  이슈 목록 테이블 설정 정보를 가져온다.
                };
@@ -99,7 +100,15 @@
                    $rootScope.spinner = true;

                    var content = {
                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
                        issueTypeId : (function () {
                            var id = "";
                            if ($rootScope.allIssueList) {
                                id = -1;
                            } else {
                                id = $rootScope.getCurrentIssueTypeId();
                            }
                            return id;
                        })(),
                        issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
                    };

@@ -117,6 +126,24 @@
                            SweetAlert.error($filter("translate")("issue.failedToSaveIssueTableSetting"), result.data.message.message); // 이슈 테이블 설정 저장 실패
                        }
                    });
                }

                //  이슈유형 별 파트너 목록
                function getUsePartner() {
                    var deferred = $q.defer();
                    $scope.vm.partners = [];

                    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.data;
                        }
                        else {
                            SweetAlert.swal($filter("translate")("issue.failedToPartnerListLookup"), result.data.message.message, "error"); // 파트너 목록 조회 실패
                        }
                        deferred.resolve(result.data.data);
                    });
                    return deferred.promise;
                }


@@ -151,7 +178,15 @@

                    var content = {
                        issueId : $rootScope.currentDetailIssueId,
                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
                        issueTypeId : (function () {
                            var id = "";
                            if ($rootScope.allIssueList) {
                                id = -1;
                            } else {
                                id = $rootScope.getCurrentIssueTypeId();
                            }
                            return id;
                        })(),
                        delValue : $scope.vm.issueRelTableConfigs.splice(8,1),
                        issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
                    };
@@ -168,48 +203,69 @@
                    return deferred.promise;
                }

                //  사용자 정의 필드를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                $scope.fn.getCustomFields().then(function (result) {
                    var count = 8;
                    angular.forEach(result, function (customField) {
                //  파트너를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                $scope.fn.getUsePartner().then(function (result) {
                    var count = 7;
                    angular.forEach(result, function (partner) {
                        $scope.vm.issueRelTableConfigs.push({
                            name : customField.name,
                            key : "CUSTOM_FIELD_" + customField.id,
                            name : partner.name,
                            key : (function () {
                                var key = "";
                                if (partner.name === "업체") {
                                    key = "REL_COMPANY";
                                } else if(partner.name === "ISP") {
                                    key = "REL_ISP";
                                } else {
                                    key = "REL_HOSTING";
                                }
                                return key;
                            })(),
                            width : "width-100-p",
                            display : false,
                            checkboxShow : true,
                            position : count
                        });

                        count++;
                    });

                    //  이슈 목록 테이블 설정 정보를 가져온다.
                    $scope.fn.getRelIssueTableConfigs().then(function (issueTableConfigs) {
                        if ($rootScope.isDefined(issueTableConfigs)) {
                            $rootScope.spinner = true;

                            // var saveTableConfigs = JSON.parse(issueTableConfigs);
                            var saveTableConfigs = JSON.parse(issueTableConfigs);

                            angular.forEach(saveTableConfigs, function (saveTableConfig) {

                                for (var count in $scope.vm.issueRelTableConfigs) {
                                    var issueTableConfig = $scope.vm.issueRelTableConfigs[count];

                                    if (issueTableConfig.key === saveTableConfig.key) {
                                        issueTableConfig.display = saveTableConfig.display;
                                        issueTableConfig.width = saveTableConfig.width;
                                        issueTableConfig.position = saveTableConfig.position;
                                        break;
                                    }
                                }
                    //  사용자 정의 필드를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                    $scope.fn.getCustomFields().then(function (result) {
                        angular.forEach(result, function (customField) {
                            $scope.vm.issueRelTableConfigs.push({
                                name : customField.name,
                                key : "CUSTOM_FIELD_" + customField.id,
                                width : "width-100-p",
                                display : false,
                                checkboxShow : true,
                                position : count
                            });
                            count++;
                        });

                            $rootScope.spinner = false;
                        }
                        //  이슈 목록 테이블 설정 정보를 가져온다.
                        $scope.fn.getRelIssueTableConfigs().then(function (issueTableConfigs) {
                            if ($rootScope.isDefined(issueTableConfigs)) {
                                $rootScope.spinner = true;

                                // var saveTableConfigs = JSON.parse(issueTableConfigs);
                                var saveTableConfigs = JSON.parse(issueTableConfigs);

                                angular.forEach(saveTableConfigs, function (saveTableConfig) {

                                    for (var count in $scope.vm.issueRelTableConfigs) {
                                        var issueTableConfig = $scope.vm.issueRelTableConfigs[count];

                                        if (issueTableConfig.key === saveTableConfig.key) {
                                            issueTableConfig.display = saveTableConfig.display;
                                            issueTableConfig.width = saveTableConfig.width;
                                            issueTableConfig.position = saveTableConfig.position;
                                            break;
                                        }
                                    }
                                });
                                $rootScope.spinner = false;
                            }
                        });
                    });
                });

            }]);
    });

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

@@ -23,6 +23,7 @@

                //  변수 모음
                $scope.vm = {
                    allIssue : parameter.allIssue,
                    issueTableConfigs : [{
                        name : $filter("translate")("issue.issueTitle"), // 이슈 제목
                        key : "ISSUE_TITLE",
@@ -104,7 +105,15 @@
                    $rootScope.spinner = true;

                    var content = {
                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
                        issueTypeId : (function () {
                            var id = "";
                            if ($rootScope.allIssueList) {
                                id = -1;
                            } else {
                                id = $rootScope.getCurrentIssueTypeId();
                            }
                            return id;
                        })(),
                        issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs)
                    };

@@ -172,7 +181,15 @@
                var content = {
                    //delValue : $scope.vm.issueTableConfigs.splice(12,1),
                    issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs),
                    issueTypeId : $rootScope.getCurrentIssueTypeId()
                    issueTypeId : (function () {
                        var id = "";
                        if ($rootScope.allIssueList) {
                            id = -1;
                        } else {
                            id = $rootScope.getCurrentIssueTypeId();
                        }
                        return id;
                    })()
                };
                //  이슈 목록 테이블 설정 정보를 가져온다.
                function getIssueAddTableConfigs() {

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

@@ -405,6 +405,33 @@
                                .setDAlign("text-center")
                                .setDName("modifyDate"));
                            break;
                        case "REL_COMPANY" :   //  업체
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("common.company")
                                .setDName("companyName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("USE_COMPANY"));
                            break;
                        case "REL_ISP" :   //  ISP
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("common.isp")
                                .setDName("ispName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("USE_ISP"));
                            break;
                        case "REL_HOSTING" :   //  HOSTING
                            $scope.vm.relTableConfigs.push($tableProvider.config()
                                .setHName("common.hosting")
                                .setDName("hostingName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("USE_HOSTING"));
                            break;
                    }

                    //  사용자 정의 필드 컬럼
@@ -505,6 +532,33 @@
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDName("modifyDate"));
                            break;
                        case "DOWN_COMPANY" :   //  업체
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("common.company")
                                .setDName("companyName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("USE_COMPANY"));
                            break;
                        case "DOWN_ISP" :   //  ISP
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("common.isp")
                                .setDName("ispName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("USE_ISP"));
                            break;
                        case "DOWN_HOSTING" :   //  HOSTING
                            $scope.vm.downTableConfigs.push($tableProvider.config()
                                .setHName("common.hosting")
                                .setDName("hostingName")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDRenderer("USE_HOSTING"));
                            break;
                    }

@@ -916,7 +970,6 @@
                            parameter : function () {
                                return {
                                    issueTypeId : $scope.vm.viewer.issueTypeVo.id

                                };
                            }
                        }
@@ -1030,7 +1083,19 @@
                        , currentDownPage, $scope.vm.subPage.selectedDownPageRowCount);

                    var content = $resourceProvider.getContent(
                        {id : $scope.vm.viewer.id, deep : "02", pageContent}, null);
                        {
                            id : $scope.vm.viewer.id
                            , issueTypeId : (function () {
                                var id = "";
                                if ($rootScope.allIssueList) {
                                    id = -1;
                                } else {
                                    id = $rootScope.getCurrentIssueTypeId();
                                }
                                return id;
                            })()
                            , deep : "02", pageContent
                        }, null);

                    Issue.detail(content).then(function (result) {


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

@@ -1061,7 +1061,8 @@
                        resolve : {
                            parameter : function () {
                                return {
                                    issueTypeId : $scope.vm.issueTypeId
                                    issueTypeId : $scope.vm.issueTypeId,
                                    allIssue : $scope.vm.allIssue
                                };
                            }
                        }
@@ -1237,7 +1238,15 @@
                    var deferred = $q.defer();

                    var content = {
                        issueTypeId : $rootScope.getCurrentIssueTypeId()
                        issueTypeId : (function () {
                            var id = "";
                            if ($rootScope.allIssueList) {
                                id = -1;
                            } else {
                                id = $rootScope.getCurrentIssueTypeId();
                            }
                            return id;
                        })()
                    }

                    IssueTableConfig.detail($resourceProvider.getContent(content,