From 1951e84f213859fb4486b2f19dc827ff3406060d Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 19:30:32 +0900
Subject: [PATCH] - 업체의 카테고리 대분류가 공백인데 중분류 조회되는 문제 해결 - 업체 상태 직접입력 일 경우 사용자가 직접입력한 상태명을 보여주도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java | 1 +
src/main/webapp/scripts/app/issue/issueAddRelation.controller.js | 8 +++++++-
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | 5 +++++
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 3 +++
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 5 +++++
src/main/webapp/scripts/app/issue/issueAddDown.controller.js | 8 +++++++-
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 8 +++++++-
src/main/webapp/scripts/app/issue/issueModify.controller.js | 8 +++++++-
8 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index 32d6003..1b771bb 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/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;
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
index bb94742..f6001ba 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/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 { //異붽� �떆
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 46f940a..6ebc5f2 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/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 = "";
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index d866e76..fe397e0 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/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 = "";
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 0a6f32d..d8b8e94 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/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;
diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
index 3b9a41f..bb6b2bc 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
+++ b/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
});
}
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
index 4739c3a..8644e44 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
+++ b/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
});
}
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 6d89d2b..59a4455 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/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
});
}
--
Gitblit v1.8.0