From 464e2317e377cd82f570170ab6adc15d005ff148 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 08 11월 2021 18:56:36 +0900
Subject: [PATCH] 업체 관리 백엔드 수정
---
src/main/java/kr/wisestone/owl/domain/CompanyField.java | 9 ++++
src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java | 65 +++++++++-----------------------
src/main/resources/mybatis/query-template/companyField-template.xml | 1
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 10 ++--
src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java | 9 ++++
src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java | 12 +++++
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 5 ++
7 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/CompanyField.java b/src/main/java/kr/wisestone/owl/domain/CompanyField.java
index 77b14c1..52618f8 100644
--- a/src/main/java/kr/wisestone/owl/domain/CompanyField.java
+++ b/src/main/java/kr/wisestone/owl/domain/CompanyField.java
@@ -14,6 +14,7 @@
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String name;
+ private String manager;
private String tel;
private String email;
private String memo;
@@ -36,6 +37,14 @@
this.name = name;
}
+ public String getManager() {
+ return manager;
+ }
+
+ public void setManager(String manager) {
+ this.manager = manager;
+ }
+
public String getTel() {
return tel;
}
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 ed110b9..d431ed6 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -130,11 +130,11 @@
// code_ko_KR �뿉 code紐� �꽕�젙
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("�뾽泥� 紐⑸줉"));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyName", this.messageAccessor.message("departmentManage.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("", this.messageAccessor.message("departmentManage.departmentDescription"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyPhone", this.messageAccessor.message("departmentManage.departmentCount"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyEmail", this.messageAccessor.message("departmentManage.departmentCount"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyDesc", this.messageAccessor.message("departmentManage.departmentCount"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("companyName", this.messageAccessor.message("companyField.companyName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("companyManager", this.messageAccessor.message("companyField.companyManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("companyTel", this.messageAccessor.message("companyField.companyTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("companyEmail", this.messageAccessor.message("companyField.companyEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("companyMemo", this.messageAccessor.message("companyField.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(companyFieldVos);
diff --git a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
index 89ce21a..4d87568 100644
--- a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
@@ -4,16 +4,18 @@
private Long id;
private String name;
+ private String manager;
private String tel;
private String email;
private String memo;
public CompanyFieldVo() {}
- public CompanyFieldVo(Long id, String name, String tel, String email, String memo) {
+ public CompanyFieldVo(Long id, String name, String manager, String tel, String email, String memo) {
this.id = id;
this.name = name;
+ this.manager = manager;
this.tel = tel;
this.email = email;
this.memo = memo;
@@ -35,6 +37,14 @@
this.name = name;
}
+ public String getManager() {
+ return manager;
+ }
+
+ public void setManager(String manager) {
+ this.manager = manager;
+ }
+
public String getTel() {
return tel;
}
diff --git a/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java b/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
index 9a8f1e9..978d0a0 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
@@ -7,13 +7,10 @@
public class CompanyFieldCondition {
private Long id;
private String name;
- private String companyType;
- private String profitYN;
- private String industry;
- private String domain;
- private String email;
+ private String manager;
private String tel;
- private String desc;
+ private String email;
+ private String memo;
private Integer Page;
private Integer PageSize;
@@ -38,44 +35,12 @@
this.name = name;
}
- public String getCompanyType() {
- return companyType;
+ public String getManager() {
+ return manager;
}
- public void setCompanyType(String companyType) {
- this.companyType = companyType;
- }
-
- public String getProfitYN() {
- return profitYN;
- }
-
- public void setProfitYN(String profitYN) {
- this.profitYN = profitYN;
- }
-
- public String getIndustry() {
- return industry;
- }
-
- public void setIndustry(String industry) {
- this.industry = industry;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
+ public void setManager(String manager) {
+ this.manager = manager;
}
public String getTel() {
@@ -86,12 +51,20 @@
this.tel = tel;
}
- public String getDesc() {
- return desc;
+ public String getEmail() {
+ return email;
}
- public void setDesc(String desc) {
- this.desc = desc;
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
}
public Integer getPage() {
diff --git a/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java b/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java
index a872e89..f18bbe2 100644
--- a/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java
@@ -10,6 +10,7 @@
public class CompanyFieldForm {
private Long id;
private String name;
+ private String manager;
private String tel;
private String email;
private String memo;
@@ -42,6 +43,14 @@
this.name = name;
}
+ public String getManager() {
+ return manager;
+ }
+
+ public void setManager(String manager) {
+ this.manager = manager;
+ }
+
public String getTel() {
return tel;
}
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index 224bdf3..c40ca51 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -7,6 +7,7 @@
SELECT
cf.id as id,
cf.name as name,
+ cf.manager as manager,
cf.tel as tel,
cf.email as email,
cf.memo as memo
diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index 7d511c8..a97c38b 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -112,3 +112,8 @@
departmentManage.departmentName=\uBD80\uC11C\uBA85
departmentManage.departmentDescription=\uBD80\uC11C\uC124\uBA85
departmentManage.departmentCount=\uBD80\uC11C\uC778\uC6D0
+companyField.companyName=\uC5C5\uCCB4\uBA85
+companyField.companyManager=\uB2F4\uB2F9\uC790
+companyField.companyTel=\uC804\uD654\uBC88\uD638
+companyField.companyEmail=\uC774\uBA54\uC77C
+companyField.companyMemo=\uBE44\uACE0
--
Gitblit v1.8.0