From 6df21aa1ee7c559145039a5cba039daffa33bbb9 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 12 Aug 2020 10:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=BD=91=E6=A0=BC=E6=95=B0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/CustomerDTO.java             | 5 +++++
 .../src/main/java/com/epmet/entity/CustomerEntity.java       | 5 +++++
 .../src/main/java/com/epmet/excel/CustomerExcel.java         | 3 +++
 .../java/com/epmet/service/impl/CustomerServiceImpl.java     | 2 ++
 .../main/resources/db/migration/V0.0.2__update_customer.sql  | 3 +++
 5 files changed, 18 insertions(+)
 create mode 100644 epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.2__update_customer.sql

diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java
index 7a78fbb209..8e752eb744 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java
@@ -88,6 +88,11 @@ public class CustomerDTO implements Serializable {
      */
 	private String logo;
 
+    /**
+     * 客户允许创建的网格数
+     */
+	private Integer gridNumber;
+
     /**
      * 删除标识：0.未删除 1.已删除
      */
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java
index c5c511cbed..6e56fbee35 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java
@@ -88,4 +88,9 @@ public class CustomerEntity extends BaseEpmetEntity {
 	 */
 	private String logo;
 
+	/**
+	 * 客户允许创建的网格数
+	 */
+	private Integer gridNumber;
+
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/excel/CustomerExcel.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/excel/CustomerExcel.java
index 1708a19dbc..7bd1260e8d 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/excel/CustomerExcel.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/excel/CustomerExcel.java
@@ -76,5 +76,8 @@ public class CustomerExcel {
     @Excel(name = "更新时间")
     private Date updatedTime;
 
+    @Excel(name = "客户允许创建的网格数")
+    private Integer gridNumber;
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index 219ad17f20..6565160593 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -470,6 +470,8 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         }
         customerEntity.setOrganizationLevel(level);
         customerEntity.setLogo("");
+        //新客户默认可以创建三个网格
+        customerEntity.setGridNumber(NumConstant.THREE);
         if (baseDao.insert(customerEntity) < NumConstant.ONE) {
             throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
         }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.2__update_customer.sql b/epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.2__update_customer.sql
new file mode 100644
index 0000000000..c60b9bfe46
--- /dev/null
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.2__update_customer.sql
@@ -0,0 +1,3 @@
+
+ALTER TABLE `customer`
+ADD COLUMN `GRID_NUMBER`  int(11) NULL COMMENT '客户允许创建的网格数' AFTER `ORGANIZATION_LEVEL`;
\ No newline at end of file