From adb461018f90e7fa3bce211b9dc372f6022f0d27 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 2 Dec 2019 17:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/branch/dev_1118/db/esua_epdc_user.sql | 19 +++++++++++++++++++ .../main/resources/mapper/group/GroupDao.xml | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql index 68f8623cc..f82958f5a 100644 --- a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql +++ b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql @@ -40,3 +40,22 @@ ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD ALL_DEPT_IDS varchar(512) ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称'; ------------------------------------------2019-11-27----------------------------------------------- +------------------------------------------2019-12-02----------------------------------------------- + +-- 新增用户邀请记录表 +CREATE TABLE epdc_user_invitation_record( + ID VARCHAR(32) NOT NULL COMMENT '主键' , + USER_ID VARCHAR(32) NOT NULL COMMENT '用户ID' , + INVITE_USER_ID VARCHAR(32) NOT NULL COMMENT '邀请人ID' , + GRID VARCHAR(128) NOT NULL COMMENT '网格' , + GRID_ID BIGINT NOT NULL COMMENT '网格ID' , + REGISTER_TIME DATETIME NOT NULL COMMENT '注册时间' , + CREATED_BY VARCHAR(32) NOT NULL COMMENT '创建人' , + CREATED_TIME DATETIME NOT NULL COMMENT '创建时间' , + UPDATED_BY VARCHAR(32) NOT NULL COMMENT '更新人' , + UPDATED_TIME DATETIME NOT NULL COMMENT '更新时间' , + DEL_FLAG VARCHAR(1) NOT NULL COMMENT '删除标记' , + PRIMARY KEY (ID) +) COMMENT = '用户邀请记录表 用户邀请记录表';; + +------------------------------------------2019-12-02----------------------------------------------- diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml index d319fed6a..6cb0258e9 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml @@ -140,10 +140,10 @@ gp.GROUP_AVATAR, gp.GROUP_CATEGORY, gp.GROUP_INTRODUCTION, - COUNT( ugp.ID ) AS totalNum, + COUNT( DISTINCT ugp.ID ) AS totalNum, ugp1.NICKNAME, ugp2.LORD_FLAG, - COUNT( tp.ID ) AS topicNum, + COUNT( DISTINCT tp.ID ) AS topicNum, CASE WHEN SUM( tp.STATE = 15 OR tp.STATE = 20 ) IS NULL THEN 0 ELSE SUM( tp.STATE = 15 OR tp.STATE = 20 )