customer_grid修改

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,13 @@ public class CustomerGridDTO implements Serializable {
      */
     private Integer totalUser;
 
+    /**
+     * 所属组织机构ID（customer_organization.id）
+     */
+    private String pid;
+
+    /**
+     * 所有上级组织ID
+     */
+    private String pids;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户网格表
  *
@@ -73,4 +70,13 @@ public class CustomerGridEntity extends BaseEpmetEntity {
 	 */
 	private Integer totalUser;
 
+	/**
+	 * 所属组织机构ID（customer_organization.id）
+	 */
+	private String pid;
+
+	/**
+	 * 所有上级组织ID
+	 */
+	private String pids;
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql

@@ -94,13 +94,15 @@ drop table IF EXISTS pdman_db_version;
 
 -- -----------------------------------------------------------------------
 -- -----------------------------------------------------------------------
-ALTER TABLE customer_grid  MODIFY COLUMN CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID';
+alter table customer_grid MODIFY column PID VARCHAR(64) NOT NULL COMMENT '所属组织机构ID（customer_organization.id）';
+alter table customer_grid MODIFY column PIDS VARCHAR(1024) NOT NULL COMMENT '所有上级组织ID';
+ALTER TABLE customer_grid MODIFY COLUMN CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID';
 ALTER TABLE customer_grid  MODIFY COLUMN LONGITUDE VARCHAR(32) DEFAULT NULL COMMENT '中心位置经度';
 ALTER TABLE customer_grid  MODIFY COLUMN LATITUDE VARCHAR(32) DEFAULT NULL COMMENT '中心位置纬度';
 ALTER TABLE customer_grid  MODIFY COLUMN AREA_CODE VARCHAR(32) DEFAULT NULL COMMENT '所属地区码（所属组织地区码）';
 alter table customer_grid drop column GRID_CODE;
-alter table customer_grid drop column PID;
-alter table customer_grid drop column PIDS;
 alter table customer_grid drop column SORT;
+
+alter table customer_grid add column ORG_ID varchar(64) NOT NULL COMMENT '所属组织机构ID（customer_organization.id）';
 alter table customer_grid add column MANAGE_DISTRICT varchar(255) DEFAULT "" NOT NULL COMMENT '管辖区域';
 alter table customer_grid add column TOTAL_USER INT(11) DEFAULT 0 NOT NULL COMMENT '当前网格总人数';

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -8,6 +8,8 @@
             gr.id,
             gr.customer_id,
             gr.grid_name,
+            gr.pid,
+            gr.pids,
             gr.longitude,
             gr.latitude,
             gr.area_code

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@@ -122,6 +122,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
         gridLatestDTO.setGridId(customerGridDTO.getId());
         gridLatestDTO.setCustomerUserId(visitedFormDTO.getUserId());
         gridLatestDTO.setAreaCode(customerGridDTO.getAreaCode());
+        gridLatestDTO.setPid(customerGridDTO.getPid());
         gridLatestDTO.setLatestTime(date);
         gridLatestDTO.setUpdatedTime(date);
         //查询是否存在历史数据（一个用户对一个网格的访问只记录一条数据）

epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql

@@ -33,4 +33,6 @@ CREATE TABLE `staff_wechat` (
   `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='工作人员微信关系表 ';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='工作人员微信关系表 ';
+
+alter table grid_latest MODIFY COLUMN PID VARCHAR(64) comment'上级组织ID (数据统计字段)'