diff --git a/esua-epdc/doc/db/dev_newRegister/esua_epdc_admin.sql b/esua-epdc/doc/db/dev_newRegister/esua_epdc_admin.sql new file mode 100644 index 000000000..148aa1e57 --- /dev/null +++ b/esua-epdc/doc/db/dev_newRegister/esua_epdc_admin.sql @@ -0,0 +1,12 @@ +-- 区分小程序码是否是网格长码 +ALTER TABLE epdc_dept_ma_code ADD COLUMN `LEADER_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '是否是网格长码,0否 1是'; + +alter table sys_role add column `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色编码'; + +INSERT INTO `esua_epdc_admin`.`sys_dict`(`id`, `pid`, `dict_type`, `dict_name`, `dict_value`, `remark`, `sort`, `del_flag`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1187259178133622786, 1187259101235253249, 'sysRoleType', '网格长', 'gridLeader', '', 0, 0, 1067246875800000001, '2019-10-24 14:47:01', 1067246875800000001, '2019-10-24 14:47:01'); +INSERT INTO `esua_epdc_admin`.`sys_dict`(`id`, `pid`, `dict_type`, `dict_name`, `dict_value`, `remark`, `sort`, `del_flag`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1187259247259947009, 1187259101235253249, 'sysRoleType', '普通用户', 'normal', '', 0, 0, 1067246875800000001, '2019-10-24 14:47:17', 1067246875800000001, '2019-10-24 14:47:17'); +INSERT INTO `esua_epdc_admin`.`sys_dict`(`id`, `pid`, `dict_type`, `dict_name`, `dict_value`, `remark`, `sort`, `del_flag`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1187540245004566530, 1187259101235253249, 'sysRoleType', '其他', 'others', '', 1, 0, 1067246875800000001, '2019-10-25 09:23:53', 1067246875800000001, '2019-10-25 09:23:59'); + +UPDATE `esua_epdc_admin`.`sys_dict` SET `pid` = 1067246875800000068, `dict_type` = 'gender', `dict_name` = '男', `dict_value` = '1', `remark` = '', `sort` = 0, `del_flag` = 0 WHERE `id` = 1067246875800000069; +UPDATE `esua_epdc_admin`.`sys_dict` SET `pid` = 1067246875800000068, `dict_type` = 'gender', `dict_name` = '女', `dict_value` = '0', `remark` = '', `sort` = 1, `del_flag` = 0 WHERE `id` = 1067246875800000070; +UPDATE `esua_epdc_admin`.`sys_dict` SET `pid` = 1067246875800000068, `dict_type` = 'gender', `dict_name` = '保密', `dict_value` = '2', `remark` = '', `sort` = 2, `del_flag` = 1 WHERE `id` = 1067246875800000071; diff --git a/esua-epdc/doc/db/dev_newRegister/esua_epdc_user.sql b/esua-epdc/doc/db/dev_newRegister/esua_epdc_user.sql index 7b4fdf68a..f1491df75 100644 --- a/esua-epdc/doc/db/dev_newRegister/esua_epdc_user.sql +++ b/esua-epdc/doc/db/dev_newRegister/esua_epdc_user.sql @@ -1,5 +1,70 @@ --- 2019-10-25 用户表去掉是否是网格长字段 -ALTER TABLE epdc_user DROP LEADER_FLAG; --- 2019-10-25 用户网格关联表增加是否是网格长字段 -ALTER TABLE epdc_user_grid_relation ADD LEADER_FLAG VARCHAR(1) NULL COMMENT '是否是网格长 0-否,1-是'; \ No newline at end of file +CREATE TABLE `epdc_user_grid_relation` ( + `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID', + `DISTRICT` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区县', + `DISTRICT_ID` bigint(20) NULL DEFAULT NULL COMMENT '区县ID', + `STREET_ID` bigint(20) NULL DEFAULT NULL COMMENT '街道ID', + `STREET` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '街道', + `COMMUNITY` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '社区', + `COMMUNITY_ID` bigint(20) NULL DEFAULT NULL COMMENT '社区ID', + `GRID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '所属网格', + `GRID_ID` bigint(20) NOT NULL COMMENT '网格ID', + `SWITCHED_TIME` datetime(0) NOT NULL COMMENT '最后切换此网格的时间', + `REVISION` int(11) NULL DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间', + `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记', + `LEADER_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否是网格长 0-否,1-是', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网格长与网格关系表' ROW_FORMAT = Compact; + +-- 上版本审核不通过的用户,直接删除 +DELETE FROM epdc_user WHERE STATE = '2'; +-- 上版本审核通过的用户,状态改为3(已完善信息且审核通过) +UPDATE epdc_user SET STATE = '3' WHERE STATE = '1'; +-- 上版本待审核用户,状态改为1(已完善信息,待审核) +UPDATE epdc_user SET STATE = '1' WHERE STATE = '0'; + +INSERT INTO `esua_epdc_user`.`epdc_user_grid_relation` ( + `ID`, + `USER_ID`, + `DISTRICT`, + `DISTRICT_ID`, + `STREET_ID`, + `STREET`, + `COMMUNITY`, + `COMMUNITY_ID`, + `GRID`, + `GRID_ID`, + `SWITCHED_TIME`, + `REVISION`, + `CREATED_BY`, + `CREATED_TIME`, + `UPDATED_BY`, + `UPDATED_TIME`, + `DEL_FLAG`, + `LEADER_FLAG` +) SELECT +u.ID, +u.ID, +u.DISTRICT, +u.DISTRICT_ID, +u.STREET_ID, +u.STREET, +u.COMMUNITY, +u.COMMUNITY_ID, +u.GRID, +u.GRID_ID, +u.CREATED_TIME, +u.REVISION, +u.CREATED_BY, +u.CREATED_TIME, +u.UPDATED_BY, +u.UPDATED_TIME, +'0', +'0' +FROM + epdc_user u \ No newline at end of file