From 71aefa2b05754e67a53e806733995d3dac6f42d2 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Sat, 25 Apr 2020 13:20:40 +0800 Subject: [PATCH] org sortorder --- .../java/org/maxkey/domain/Organizations.java | 429 +++++++++--------- .../templates/views/orgs/orgsList.ftl | 2 +- 2 files changed, 215 insertions(+), 216 deletions(-) diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java b/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java index a576736f2..b9695e591 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java @@ -10,270 +10,269 @@ import javax.persistence.Table; import org.apache.mybatis.jpa.persistence.JpaBaseDomain; -@Table(name = "ORGANIZATIONS") -public class Organizations extends JpaBaseDomain implements Serializable{ - - @Id - @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="uuid") - private String id; - @Column - private String code; - @Column - private String name; - @Column - private String fullName; - @Column - private String pId; - @Column - private String pName; - @Column - private String type; - @Column - private String xPath; - @Column - private String xNamePath; - @Column - private String level; - @Column - private String hasChild; - @Column - private String division; - @Column - private String country; - @Column - private String region; - @Column - private String locality; - @Column - private String street; - @Column - private String address; - @Column - private String contact; - @Column - private String postalCode; - @Column - private String phone; - @Column - private String fax; - @Column - private String email; - @Column - private String sortOrder; - @Column - private String description; - - /** - * - */ - private static final long serialVersionUID = 5085413816404119803L; +@Table(name = "ORGANIZATIONS") +public class Organizations extends JpaBaseDomain implements Serializable { - public Organizations() { - // TODO Auto-generated constructor stub - } + @Id + @Column + @GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid") + private String id; + @Column + private String code; + @Column + private String name; + @Column + private String fullName; + @Column + private String pId; + @Column + private String pName; + @Column + private String type; + @Column + private String xPath; + @Column + private String xNamePath; + @Column + private String level; + @Column + private String hasChild; + @Column + private String division; + @Column + private String country; + @Column + private String region; + @Column + private String locality; + @Column + private String street; + @Column + private String address; + @Column + private String contact; + @Column + private String postalCode; + @Column + private String phone; + @Column + private String fax; + @Column + private String email; + @Column + private String sortOrder; + @Column + private String description; - public String getId() { - return id; - } + /** + * + */ + private static final long serialVersionUID = 5085413816404119803L; - public void setId(String id) { - this.id = id; - } + public Organizations() { + // TODO Auto-generated constructor stub + } - public String getCode() { - return code; - } + public String getId() { + return id; + } - public void setCode(String code) { - this.code = code; - } + public void setId(String id) { + this.id = id; + } - public String getName() { - return name; - } + public String getCode() { + return code; + } - public void setName(String name) { - this.name = name; - } + public void setCode(String code) { + this.code = code; + } - public String getFullName() { - return fullName; - } + public String getName() { + return name; + } - public void setFullName(String fullName) { - this.fullName = fullName; - } + public void setName(String name) { + this.name = name; + } - public String getpId() { - return pId; - } + public String getFullName() { + return fullName; + } - public void setpId(String pId) { - this.pId = pId; - } + public void setFullName(String fullName) { + this.fullName = fullName; + } - public String getpName() { - return pName; - } + public String getpId() { + return pId; + } - public void setpName(String pName) { - this.pName = pName; - } + public void setpId(String pId) { + this.pId = pId; + } - public String getType() { - return type; - } + public String getpName() { + return pName; + } - public void setType(String type) { - this.type = type; - } + public void setpName(String pName) { + this.pName = pName; + } - public String getxPath() { - return xPath; - } + public String getType() { + return type; + } - public void setxPath(String xPath) { - this.xPath = xPath; - } + public void setType(String type) { + this.type = type; + } - public String getxNamePath() { - return xNamePath; - } + public String getxPath() { + return xPath; + } - public void setxNamePath(String xNamePath) { - this.xNamePath = xNamePath; - } + public void setxPath(String xPath) { + this.xPath = xPath; + } - public String getLevel() { - return level; - } + public String getxNamePath() { + return xNamePath; + } - public void setLevel(String level) { - this.level = level; - } + public void setxNamePath(String xNamePath) { + this.xNamePath = xNamePath; + } - public String getHasChild() { - return hasChild; - } + public String getLevel() { + return level; + } - public void setHasChild(String hasChild) { - this.hasChild = hasChild; - } + public void setLevel(String level) { + this.level = level; + } - public String getDivision() { - return division; - } + public String getHasChild() { + return hasChild; + } - public void setDivision(String division) { - this.division = division; - } + public void setHasChild(String hasChild) { + this.hasChild = hasChild; + } - public String getCountry() { - return country; - } + public String getDivision() { + return division; + } - public void setCountry(String country) { - this.country = country; - } + public void setDivision(String division) { + this.division = division; + } - public String getRegion() { - return region; - } + public String getCountry() { + return country; + } - public void setRegion(String region) { - this.region = region; - } + public void setCountry(String country) { + this.country = country; + } - public String getLocality() { - return locality; - } + public String getRegion() { + return region; + } - public void setLocality(String locality) { - this.locality = locality; - } + public void setRegion(String region) { + this.region = region; + } - public String getStreet() { - return street; - } + public String getLocality() { + return locality; + } - public void setStreet(String street) { - this.street = street; - } + public void setLocality(String locality) { + this.locality = locality; + } - public String getAddress() { - return address; - } + public String getStreet() { + return street; + } - public void setAddress(String address) { - this.address = address; - } + public void setStreet(String street) { + this.street = street; + } - public String getContact() { - return contact; - } + public String getAddress() { + return address; + } - public void setContact(String contact) { - this.contact = contact; - } + public void setAddress(String address) { + this.address = address; + } - public String getPostalCode() { - return postalCode; - } + public String getContact() { + return contact; + } - public void setPostalCode(String postalCode) { - this.postalCode = postalCode; - } + public void setContact(String contact) { + this.contact = contact; + } - public String getPhone() { - return phone; - } + public String getPostalCode() { + return postalCode; + } - public void setPhone(String phone) { - this.phone = phone; - } + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } - public String getFax() { - return fax; - } + public String getPhone() { + return phone; + } - public void setFax(String fax) { - this.fax = fax; - } + public void setPhone(String phone) { + this.phone = phone; + } - public String getEmail() { - return email; - } + public String getFax() { + return fax; + } - public void setEmail(String email) { - this.email = email; - } + public void setFax(String fax) { + this.fax = fax; + } - - public String getSortOrder() { - return sortOrder; - } + public String getEmail() { + return email; + } - public void setSortOrder(String sortOrder) { - this.sortOrder = sortOrder; - } + public void setEmail(String email) { + this.email = email; + } - public String getDescription() { - return description; - } + public String getSortOrder() { + return sortOrder; + } - public void setDescription(String description) { - this.description = description; - } + public void setSortOrder(String sortOrder) { + this.sortOrder = sortOrder; + } - @Override - public String toString() { - return "Organizations [id=" + id + ", code=" + code + ", name=" + name + ", fullName=" + fullName + ", pId=" - + pId + ", pName=" + pName + ", type=" + type + ", xPath=" + xPath + ", xNamePath=" + xNamePath - + ", level=" + level + ", hasChild=" + hasChild + ", division=" + division + ", country=" + country - + ", region=" + region + ", locality=" + locality + ", street=" + street + ", address=" + address - + ", contact=" + contact + ", postalCode=" + postalCode + ", phone=" + phone + ", fax=" + fax - + ", email=" + email + ", sortOrder=" + sortOrder + ", description=" + description + "]"; - } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public String toString() { + return "Organizations [id=" + id + ", code=" + code + ", name=" + name + ", fullName=" + fullName + ", pId=" + + pId + ", pName=" + pName + ", type=" + type + ", xPath=" + xPath + ", xNamePath=" + xNamePath + + ", level=" + level + ", hasChild=" + hasChild + ", division=" + division + ", country=" + country + + ", region=" + region + ", locality=" + locality + ", street=" + street + ", address=" + address + + ", contact=" + contact + ", postalCode=" + postalCode + ", phone=" + phone + ", fax=" + fax + + ", email=" + email + ", sortOrder=" + sortOrder + ", description=" + description + "]"; + } } diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl index 0cdf12d7f..20837cd1e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl @@ -233,7 +233,7 @@ $(function () { Id <@locale code="org.id"/> <@locale code="org.name"/> - <@locale code="org.sortorder"/> + <@locale code="org.sortorder"/> <@locale code="org.division"/> <@locale code="org.description"/>