From 567556af0acaf45329ec79b9fb40cdb9388939fd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 08 11월 2021 17:13:47 +0900
Subject: [PATCH] 업체 관리 백엔드 수정
---
src/main/java/kr/wisestone/owl/domain/CompanyField.java | 56 ++-----------
src/main/resources/migration/V1_11__Alter_Table.sql | 8 -
src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java | 10 +-
src/main/resources/mybatis/query-template/companyField-template.xml | 4
src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java | 56 ++-----------
src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java | 66 +++-------------
6 files changed, 42 insertions(+), 158 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/CompanyField.java b/src/main/java/kr/wisestone/owl/domain/CompanyField.java
index df714bc..77b14c1 100644
--- a/src/main/java/kr/wisestone/owl/domain/CompanyField.java
+++ b/src/main/java/kr/wisestone/owl/domain/CompanyField.java
@@ -14,13 +14,9 @@
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String name;
- private String companyType;
- private String profitYN;
- private String industy;
- private String domain;
- private String email;
private String tel;
- private String desc;
+ private String email;
+ private String memo;
public CompanyField() {}
@@ -40,36 +36,12 @@
this.name = name;
}
- public String getCompanyType() {
- return companyType;
+ public String getTel() {
+ return tel;
}
- public void setCompanyType(String companyType) {
- this.companyType = companyType;
- }
-
- public String getProfitYN() {
- return profitYN;
- }
-
- public void setProfitYN(String profitYN) {
- this.profitYN = profitYN;
- }
-
- public String getIndusty() {
- return industy;
- }
-
- public void setIndusty(String industy) {
- this.industy = industy;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
+ public void setTel(String tel) {
+ this.tel = tel;
}
public String getEmail() {
@@ -80,19 +52,11 @@
this.email = email;
}
- public String getTel() {
- return tel;
+ public String getMemo() {
+ return memo;
}
- public void setTel(String tel) {
- this.tel = tel;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
+ public void setMemo(String memo) {
+ this.memo = memo;
}
}
diff --git a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
index 9fd52a1..89ce21a 100644
--- a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
@@ -4,27 +4,19 @@
private Long id;
private String name;
- private String companyType;
- private String profitYN;
- private String industy;
- private String domain;
- private String email;
private String tel;
- private String desc;
+ private String email;
+ private String memo;
public CompanyFieldVo() {}
- public CompanyFieldVo(Long id, String name, String companyType, String profitYN, String industy, String domain, String email, String tel, String desc) {
+ public CompanyFieldVo(Long id, String name, String tel, String email, String memo) {
this.id = id;
this.name = name;
- this.companyType = companyType;
- this.profitYN = profitYN;
- this.industy = industy;
- this.domain = domain;
- this.email = email;
this.tel = tel;
- this.desc = desc;
+ this.email = email;
+ this.memo = memo;
}
public Long getId() {
@@ -43,36 +35,12 @@
this.name = name;
}
- public String getCompanyType() {
- return companyType;
+ public String getTel() {
+ return tel;
}
- public void setCompanyType(String companyType) {
- this.companyType = companyType;
- }
-
- public String getProfitYN() {
- return profitYN;
- }
-
- public void setProfitYN(String profitYN) {
- this.profitYN = profitYN;
- }
-
- public String getIndusty() {
- return industy;
- }
-
- public void setIndusty(String industy) {
- this.industy = industy;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
+ public void setTel(String tel) {
+ this.tel = tel;
}
public String getEmail() {
@@ -83,19 +51,11 @@
this.email = email;
}
- public String getTel() {
- return tel;
+ public String getMemo() {
+ return memo;
}
- public void setTel(String tel) {
- this.tel = tel;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
+ public void setMemo(String memo) {
+ this.memo = memo;
}
}
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 9385756..9a8f1e9 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
@@ -9,7 +9,7 @@
private String name;
private String companyType;
private String profitYN;
- private String industy;
+ private String industry;
private String domain;
private String email;
private String tel;
@@ -54,12 +54,12 @@
this.profitYN = profitYN;
}
- public String getIndusty() {
- return industy;
+ public String getIndustry() {
+ return industry;
}
- public void setIndusty(String industy) {
- this.industy = industy;
+ public void setIndustry(String industry) {
+ this.industry = industry;
}
public String getDomain() {
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 786003e..a872e89 100644
--- a/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java
@@ -10,13 +10,9 @@
public class CompanyFieldForm {
private Long id;
private String name;
- private String companyType;
- private String profitYN;
- private String industy;
- private String domain;
- private String email;
private String tel;
- private String desc;
+ private String email;
+ private String memo;
private List<Long> removeIds = Lists.newArrayList();
public CompanyFieldForm() {
@@ -46,36 +42,12 @@
this.name = name;
}
- public String getCompanyType() {
- return companyType;
+ public String getTel() {
+ return tel;
}
- public void setCompanyType(String companyType) {
- this.companyType = companyType;
- }
-
- public String getProfitYN() {
- return profitYN;
- }
-
- public void setProfitYN(String profitYN) {
- this.profitYN = profitYN;
- }
-
- public String getIndusty() {
- return industy;
- }
-
- public void setIndusty(String industy) {
- this.industy = industy;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
+ public void setTel(String tel) {
+ this.tel = tel;
}
public String getEmail() {
@@ -86,20 +58,12 @@
this.email = email;
}
- public String getTel() {
- return tel;
+ public String getMemo() {
+ return memo;
}
- public void setTel(String tel) {
- this.tel = tel;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
+ public void setMemo(String memo) {
+ this.memo = memo;
}
public List<Long> getRemoveIds() {
diff --git a/src/main/resources/migration/V1_11__Alter_Table.sql b/src/main/resources/migration/V1_11__Alter_Table.sql
index 024844b..85df95e 100644
--- a/src/main/resources/migration/V1_11__Alter_Table.sql
+++ b/src/main/resources/migration/V1_11__Alter_Table.sql
@@ -1,13 +1,9 @@
CREATE TABLE `company`(
`id` BIGINT(11) AUTO_INCREMENT,
`name` VARCHAR(50) NOT NULL,
- `company_type` VARCHAR(50) NOT NULL,
- `profit_yn` VARCHAR(50) NOT NULL,
- `industry` VARCHAR(50) NOT NULL,
- `domain` VARCHAR(255) NOT NULL,
- `email` VARCHAR (255) NOT NULL,
`tel` VARCHAR (50) NOT NULL,
- `desc` VARCHAR(255) NOT NULL,
+ `email` VARCHAR (255) NOT NULL,
+ `memo` VARCHAR(255) NOT NULL,
`register_date` TIMESTAMP NULL,
`modify_id` BIGINT(20) NOT NULL,
`modify_date` TIMESTAMP NULL,
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index 0aac445..4dd9d58 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -7,9 +7,9 @@
SELECT
c.id as id,
c.name as name,
- c.email as email,
c.tel as tel,
- c.desc as desc
+ c.email as email,
+ c.memo as memo
FROM
company c
WHERE 1=1
--
Gitblit v1.8.0