diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgDailyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgDailyFormDTO.java index c80f1431a4..92a13b72ed 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgDailyFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgDailyFormDTO.java @@ -34,11 +34,6 @@ public class ScreenWorkRecordOrgDailyFormDTO implements Serializable { */ private Integer organizeTotal; - /** - * 当前组织参与的总次数 - */ - private Integer participateTotal; - /** * 参与人数 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgMonthlyDTO.java index 202ce07a3c..4848454792 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgMonthlyDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgMonthlyDTO.java @@ -69,11 +69,6 @@ public class ScreenWorkRecordOrgMonthlyDTO implements Serializable { */ private Integer organizeTotal; - /** - * 当前组织参与的总次数 - */ - private Integer participateTotal; - /** * 参与人数 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java index 637ca82807..a7bf893b08 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java @@ -65,11 +65,6 @@ public class ScreenWorkRecordOrgMonthlyEntity extends BaseEpmetEntity { */ private Integer organizeTotal; - /** - * 当前组织参与的总次数 - */ - private Integer participateTotal; - /** * 参与人数 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql index 87365d4ab7..513549004f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql @@ -93,11 +93,10 @@ CREATE TABLE `screen_work_record_org_monthly` ( `ID` varchar(64) NOT NULL COMMENT 'ID 主键', `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id:yyyyMM', - `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id', + `ORG_ID` varchar(64) NOT NULL COMMENT '组织Idor网格id', `MEETING_CODE` varchar(255) DEFAULT NULL COMMENT '会议类型编码;对应screen_customer_work_record_dict的资源编码', `TYPE_CODE` varchar(255) NOT NULL COMMENT '随手记类型编码;对应screen_customer_work_record_dict的资源编码', `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '组织次数', - `PARTICIPATE_TOTAL` int(11) NOT NULL COMMENT '当前组织参与的总次数', `PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '参与人数', `AVG_PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '平均参与人数', `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除;1已删除', @@ -115,11 +114,10 @@ CREATE TABLE `screen_work_record_org_daily` ( `ID` varchar(64) NOT NULL COMMENT 'ID 主键', `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', `DATE_ID` varchar(8) NOT NULL COMMENT '日期Id:yyyyMMdd', - `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id', + `ORG_ID` varchar(64) NOT NULL COMMENT '组织Idor网格id', `MEETING_CODE` varchar(255) DEFAULT NULL COMMENT '会议类型编码;对应screen_customer_work_record_dict的资源编码', `TYPE_CODE` varchar(255) NOT NULL COMMENT '随手记类型编码;对应screen_customer_work_record_dict的资源编码', `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '组织次数', - `PARTICIPATE_TOTAL` int(11) NOT NULL COMMENT '当前组织参与的总次数', `PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '参与人数', `AVG_PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '平均参与人数', `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除;1已删除', diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml index e930cb3b7c..8c9c216b5e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml @@ -11,7 +11,6 @@ - @@ -33,7 +32,6 @@ meeting_code, type_code, organize_total, - participate_total, participate_user_total, avg_participate_user_total, del_flag, @@ -59,8 +57,6 @@ #{item.organizeTotal}, - #{item.participateTotal}, - #{item.participateUserTotal}, #{item.avgParticipateUserTotal},