From c18c5fad9a765a4b6e65ce0df810c733ae90bf73 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 26 1월 2022 18:00:21 +0900
Subject: [PATCH] 업체정보 리스트에 비고 컬럼 삭제하고 ISP,호스팅 이름 보여주기
---
src/main/resources/mybatis/query-template/companyField-template.xml | 6 +++++-
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 15 ++++++++++-----
src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java | 18 ++++++++++++++++++
3 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
index 3ac93c8..ddc0c89 100644
--- a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
@@ -27,6 +27,8 @@
private IspFieldVo ispFieldVo;
private HostingFieldVo hostingFieldVo;
+ private String ispName;
+ private String hostingName;
public CompanyFieldVo() {}
@@ -189,4 +191,20 @@
public void setStatusName(String statusName) {
this.statusName = statusName;
}
+
+ public String getIspName() {
+ return ispName;
+ }
+
+ public void setIspName(String ispName) {
+ this.ispName = ispName;
+ }
+
+ public String getHostingName() {
+ return hostingName;
+ }
+
+ public void setHostingName(String hostingName) {
+ this.hostingName = hostingName;
+ }
}
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index 466d7e2..61f27e8 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -19,9 +19,13 @@
cf.child_sector_id as childSectorId,
cf.region_id as regionId,
cf.status_id as statusId,
- cf.status_name as statusName
+ cf.status_name as statusName,
+ sf.name AS ispName,
+ hf.name AS hostingName
FROM
company_field cf
+ LEFT OUTER JOIN isp_field sf ON cf.isp_id = sf.id
+ LEFT OUTER JOIN hosting_field hf ON cf.hosting_id = hf.id
WHERE 1=1
<if test="name != '' and name != null">
AND cf.name like CONCAT('%',#{name},'%')
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 33421f6..89addc2 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -109,6 +109,16 @@
.setDName("url")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("ispField.name")
+ .setHWidth("bold")
+ .setDName("ispName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("hostingField.name")
+ .setHWidth("bold")
+ .setDName("hostingName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.companyType")
.setHWidth("bold")
.setDName("companyTypeName")
@@ -132,11 +142,6 @@
.setHName("companyField.status")
.setHWidth("bold")
.setDName("statusName")
- .setDAlign("text-center"));
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("companyField.memo")
- .setHWidth("bold")
- .setDName("memo")
.setDAlign("text-center"));
}
--
Gitblit v1.8.0