diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.28__fact_icuser_category_analysis_daily.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.28__fact_icuser_category_analysis_daily.sql new file mode 100644 index 0000000000..530d2d1dfc --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.28__fact_icuser_category_analysis_daily.sql @@ -0,0 +1,21 @@ +CREATE TABLE `fact_icuser_category_analysis_daily` ( + `ID` varchar(32) NOT NULL COMMENT '主键(人员类别分析表)', + `CUSTOMER_ID` varchar(32) NOT NULL COMMENT '客户id', + `CONFIG_ID` varchar(64) NOT NULL COMMENT '预警配置ID', + `COLUMN_NAME` varchar(32) NOT NULL COMMENT '列名', + `DATE_ID` varchar(8) NOT NULL COMMENT '当前数据是截止到XXX的:yyyyMMdd', + `ORG_ID` varchar(32) NOT NULL COMMENT '网格id或者组织id', + `ORG_TYPE` varchar(10) NOT NULL COMMENT 'grid或者agency', + `PID` varchar(32) NOT NULL COMMENT 'orgid的上级', + `PIDS` varchar(255) NOT NULL COMMENT 'orgid的所有上级', + `TOTAL` int(11) NOT NULL COMMENT '当前类别总人数', + `QR_INCR` int(11) NOT NULL COMMENT '较上月迁入', + `QC_INCR` int(11) NOT NULL COMMENT '较上月迁出', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='人员类别分析(目前只统计了网格)'; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index 4241e3428b..8567a7c165 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -248,7 +248,9 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl" + changeList.size()); icUserChangeRecordService.insertBatch(changeList); + log.info("初始变更记录明细数据,总条数->" + detailedList.size()); icUserChangeDetailedService.insertBatch(detailedList); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index 9d1470f253..7f8fa309cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -41,6 +41,7 @@ import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.service.IcUserChangeDetailedService; import com.epmet.service.IcUserChangeRecordService; import com.epmet.service.IcUserTransferRecordService; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -161,13 +162,13 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl - LEFT JOIN ic_user_change_record iucr ON iru.id = iucr.ic_user_id AND iucr.type = 'add' + LEFT JOIN ic_user_change_record iucr ON iru.id = iucr.ic_user_id AND iucr.type = 'add' AND iucr.del_flag = '0' WHERE iucr.ic_user_id IS NULL AND iru.del_flag = '0'