From d7ee12cb208473741f79b64505adccd0653e4654 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 27 Oct 2020 13:44:28 +0800
Subject: [PATCH] vue页面增加误差率参数，沧州剔除非本公司设备显示，报表接口更新
---
src/main/java/com/moral/entity/Organization.java | 198 ++++++++++++++++++++-----------------------------
1 files changed, 82 insertions(+), 116 deletions(-)
diff --git a/src/main/java/com/moral/entity/Organization.java b/src/main/java/com/moral/entity/Organization.java
index 983b41f..eb237bb 100644
--- a/src/main/java/com/moral/entity/Organization.java
+++ b/src/main/java/com/moral/entity/Organization.java
@@ -1,135 +1,101 @@
package com.moral.entity;
import java.util.Date;
+import java.util.Map;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+
+import lombok.Data;
+
+@Data
public class Organization {
- private Integer id;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.id
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
- private String name;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.name
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private String name;
- private Integer rank;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.rank
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private Integer rank;
- private Integer provinceCode;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.province_code
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private Integer provinceCode;
- private Integer cityCode;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.city_code
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private Integer cityCode;
- private Integer areaCode;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.area_code
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private Integer areaCode;
- private String address;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.address
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private String address;
- private String telephone;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.telephone
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private String telephone;
- private String email;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.email
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private String email;
- private String isDelete;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.is_delete
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private String isDelete;
- private Date createTime;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.create_time
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private Date createTime;
- private Date expireTime;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.expire_time
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private Date expireTime;
- private String description;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column organization.description
+ * @mbggenerated Thu Dec 07 15:18:16 CST 2017
+ */
+ private String description;
+ private Long townCode;
+ private Long villageCode;
+ @Transient
+ private Integer parentId;
+ @Transient
+ private AreaNames areaNames;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getRank() {
- return rank;
- }
-
- public void setRank(Integer rank) {
- this.rank = rank;
- }
-
- public Integer getProvinceCode() {
- return provinceCode;
- }
-
- public void setProvinceCode(Integer provinceCode) {
- this.provinceCode = provinceCode;
- }
-
- public Integer getCityCode() {
- return cityCode;
- }
-
- public void setCityCode(Integer cityCode) {
- this.cityCode = cityCode;
- }
-
- public Integer getAreaCode() {
- return areaCode;
- }
-
- public void setAreaCode(Integer areaCode) {
- this.areaCode = areaCode;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getTelephone() {
- return telephone;
- }
-
- public void setTelephone(String telephone) {
- this.telephone = telephone;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(String isDelete) {
- this.isDelete = isDelete;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getExpireTime() {
- return expireTime;
- }
-
- public void setExpireTime(Date expireTime) {
- this.expireTime = expireTime;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0