~jhpark/owl-kisa.git - maprexDevGit

부모: f8d35ef0 | 패치 | 커밋 | ignore whitespace

- 업체의 카테고리 대분류가 공백인데 중분류 조회되는 문제 해결 - 업체 상태 직접입력 일 경우 사용자가 직접입력한 상태명을 보여주도록 수정

minhee

2022-02-11 1951e84f213859fb4486b2f19dc827ff3406060d

- 업체의 카테고리 대분류가 공백인데 중분류 조회되는 문제 해결
- 업체 상태 직접입력 일 경우 사용자가 직접입력한 상태명을 보여주도록 수정

8개 파일 변경됨

	src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java	3 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java	1 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js	5 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js	5 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueAdd.controller.js	8 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueAddDown.controller.js	8 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueAddRelation.controller.js	8 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueModify.controller.js	8 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리

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

@@ -186,6 +186,9 @@
                companyFieldVo.setRegionName(region.getUseValue());
            }
        }
        if (companyField.getStatusName() != null && !companyField.getStatusName().equals("")) {
            companyFieldVo.setStatusName(companyField.getStatusName());
        }
        return companyFieldVo;
    }


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

@@ -136,6 +136,7 @@
                    issueCompany.setChildSectorId(MapUtil.getLong(param, "childSectorId"));
                    issueCompany.setRegionId(MapUtil.getLong(param, "regionId"));
                    issueCompany.setStatusId(MapUtil.getLong(param, "statusId"));
                    issueCompany.setStatusName(MapUtil.getString(param, "statusName"));

                    this.issueCompanyRepository.saveAndFlush(issueCompany);
                } else { //추가 시

 src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js

@@ -159,6 +159,11 @@
                $scope.$on("parentSectorEvent", function (event, result) {
                    if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
                        $scope.vm.form.parentSectorId = result[0].id;
                    } else {
                        $scope.vm.form.parentSectorId = "";
                        if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
                            $scope.vm.form.parentSectors[0].id = "";
                        }
                    }
                    $scope.vm.form.childSectorId = "";
                    $scope.vm.form.childSector = "";

 src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js

@@ -163,6 +163,11 @@
                $scope.$on("parentSectorEvent", function (event, result) {
                    if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
                        $scope.vm.form.parentSectorId = result[0].id;
                    }  else {
                        $scope.vm.form.parentSectorId = "";
                        if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
                            $scope.vm.form.parentSectors[0].id = "";
                        }
                    }
                    $scope.vm.form.childSectorId = "";
                    $scope.vm.form.childSector = "";

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

@@ -559,6 +559,11 @@
                $scope.$on("parentSectorEvent", function (event, result) {
                    if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
                        $scope.vm.form.parentSectorId = result[0].id;
                    }  else {
                        $scope.vm.form.parentSectorId = "";
                        if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
                            $scope.vm.form.parentSectors[0].id = "";
                        }
                    }
                    $scope.vm.form.childSectorId = "";
                    $scope.vm.form.childSector = "";
@@ -680,7 +685,8 @@
                                    parentSectorId : $scope.vm.form.parentSectorId,
                                    childSectorId : $scope.vm.form.childSectorId,
                                    regionId : $scope.vm.form.regionId,
                                    statusId : $scope.vm.form.statusId
                                    statusId : $scope.vm.form.statusId,
                                    statusName : $scope.vm.form.status
                                });
                            }
                            return issueCompanyFields;

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

@@ -548,6 +548,11 @@
                $scope.$on("parentSectorEvent", function (event, result) {
                    if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
                        $scope.vm.form.parentSectorId = result[0].id;
                    }  else {
                        $scope.vm.form.parentSectorId = "";
                        if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
                            $scope.vm.form.parentSectors[0].id = "";
                        }
                    }
                    $scope.vm.form.childSectorId = "";
                    $scope.vm.form.childSector = "";
@@ -731,7 +736,8 @@
                                    parentSectorId : $scope.vm.form.parentSectorId,
                                    childSectorId : $scope.vm.form.childSectorId,
                                    regionId : $scope.vm.form.regionId,
                                    statusId : $scope.vm.form.statusId
                                    statusId : $scope.vm.form.statusId,
                                    statusName : $scope.vm.form.status
                                });
                            }


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

@@ -562,6 +562,11 @@
                $scope.$on("parentSectorEvent", function (event, result) {
                    if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
                        $scope.vm.form.parentSectorId = result[0].id;
                    }  else {
                        $scope.vm.form.parentSectorId = "";
                        if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
                            $scope.vm.form.parentSectors[0].id = "";
                        }
                    }
                    $scope.vm.form.childSectorId = "";
                    $scope.vm.form.childSector = "";
@@ -745,7 +750,8 @@
                                    parentSectorId : $scope.vm.form.parentSectorId,
                                    childSectorId : $scope.vm.form.childSectorId,
                                    regionId : $scope.vm.form.regionId,
                                    statusId : $scope.vm.form.statusId
                                    statusId : $scope.vm.form.statusId,
                                    statusName : $scope.vm.form.status
                                });
                            }


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

@@ -443,6 +443,11 @@
                $scope.$on("parentSectorEvent", function (event, result) {
                    if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
                        $scope.vm.form.parentSectorId = result[0].id;
                    }  else {
                        $scope.vm.form.parentSectorId = "";
                        if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
                            $scope.vm.form.parentSectors[0].id = "";
                        }
                    }
                    $scope.vm.form.childSectorId = "";
                    $scope.vm.form.childSector = "";
@@ -734,7 +739,8 @@
                                    parentSectorId : $scope.vm.form.parentSectorId,
                                    childSectorId : $scope.vm.form.childSectorId,
                                    regionId : $scope.vm.form.regionId,
                                    statusId : $scope.vm.form.statusId
                                    statusId : $scope.vm.form.statusId,
                                    statusName : $scope.vm.form.status
                                });
                            }

			@@ -186,6 +186,9 @@
			companyFieldVo.setRegionName(region.getUseValue());
			}
			}
			if (companyField.getStatusName() != null && !companyField.getStatusName().equals("")) {
			companyFieldVo.setStatusName(companyField.getStatusName());
			}
			return companyFieldVo;
			}

			@@ -136,6 +136,7 @@
			issueCompany.setChildSectorId(MapUtil.getLong(param, "childSectorId"));
			issueCompany.setRegionId(MapUtil.getLong(param, "regionId"));
			issueCompany.setStatusId(MapUtil.getLong(param, "statusId"));
			issueCompany.setStatusName(MapUtil.getString(param, "statusName"));

			this.issueCompanyRepository.saveAndFlush(issueCompany);
			} else { //추가 시

			@@ -159,6 +159,11 @@
			$scope.$on("parentSectorEvent", function (event, result) {
			if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
			$scope.vm.form.parentSectorId = result[0].id;
			} else {
			$scope.vm.form.parentSectorId = "";
			if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
			$scope.vm.form.parentSectors[0].id = "";
			}
			}
			$scope.vm.form.childSectorId = "";
			$scope.vm.form.childSector = "";

			@@ -163,6 +163,11 @@
			$scope.$on("parentSectorEvent", function (event, result) {
			if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
			$scope.vm.form.parentSectorId = result[0].id;
			} else {
			$scope.vm.form.parentSectorId = "";
			if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
			$scope.vm.form.parentSectors[0].id = "";
			}
			}
			$scope.vm.form.childSectorId = "";
			$scope.vm.form.childSector = "";

			@@ -559,6 +559,11 @@
			$scope.$on("parentSectorEvent", function (event, result) {
			if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
			$scope.vm.form.parentSectorId = result[0].id;
			} else {
			$scope.vm.form.parentSectorId = "";
			if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
			$scope.vm.form.parentSectors[0].id = "";
			}
			}
			$scope.vm.form.childSectorId = "";
			$scope.vm.form.childSector = "";
			@@ -680,7 +685,8 @@
			parentSectorId : $scope.vm.form.parentSectorId,
			childSectorId : $scope.vm.form.childSectorId,
			regionId : $scope.vm.form.regionId,
			statusId : $scope.vm.form.statusId
			statusId : $scope.vm.form.statusId,
			statusName : $scope.vm.form.status
			});
			}
			return issueCompanyFields;

			@@ -548,6 +548,11 @@
			$scope.$on("parentSectorEvent", function (event, result) {
			if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
			$scope.vm.form.parentSectorId = result[0].id;
			} else {
			$scope.vm.form.parentSectorId = "";
			if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
			$scope.vm.form.parentSectors[0].id = "";
			}
			}
			$scope.vm.form.childSectorId = "";
			$scope.vm.form.childSector = "";
			@@ -731,7 +736,8 @@
			parentSectorId : $scope.vm.form.parentSectorId,
			childSectorId : $scope.vm.form.childSectorId,
			regionId : $scope.vm.form.regionId,
			statusId : $scope.vm.form.statusId
			statusId : $scope.vm.form.statusId,
			statusName : $scope.vm.form.status
			});
			}

			@@ -562,6 +562,11 @@
			$scope.$on("parentSectorEvent", function (event, result) {
			if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
			$scope.vm.form.parentSectorId = result[0].id;
			} else {
			$scope.vm.form.parentSectorId = "";
			if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
			$scope.vm.form.parentSectors[0].id = "";
			}
			}
			$scope.vm.form.childSectorId = "";
			$scope.vm.form.childSector = "";
			@@ -745,7 +750,8 @@
			parentSectorId : $scope.vm.form.parentSectorId,
			childSectorId : $scope.vm.form.childSectorId,
			regionId : $scope.vm.form.regionId,
			statusId : $scope.vm.form.statusId
			statusId : $scope.vm.form.statusId,
			statusName : $scope.vm.form.status
			});
			}

			@@ -443,6 +443,11 @@
			$scope.$on("parentSectorEvent", function (event, result) {
			if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
			$scope.vm.form.parentSectorId = result[0].id;
			} else {
			$scope.vm.form.parentSectorId = "";
			if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
			$scope.vm.form.parentSectors[0].id = "";
			}
			}
			$scope.vm.form.childSectorId = "";
			$scope.vm.form.childSector = "";
			@@ -734,7 +739,8 @@
			parentSectorId : $scope.vm.form.parentSectorId,
			childSectorId : $scope.vm.form.childSectorId,
			regionId : $scope.vm.form.regionId,
			statusId : $scope.vm.form.statusId
			statusId : $scope.vm.form.statusId,
			statusName : $scope.vm.form.status
			});
			}