Merge branch 'develop' into release_temp

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='人员类别分析（目前只统计了网格）';

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

@@ -248,7 +248,9 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
         //4.批量新增数据,先删后增【只删除新增节点的历史数据】
         baseDao.delByCustomerId(customerId, "add");
         icUserChangeDetailedService.delByCustomerId(customerId, "add");
+        log.info("初始变更记录数据，总条数->" + changeList.size());
         icUserChangeRecordService.insertBatch(changeList);
+        log.info("初始变更记录明细数据，总条数->" + detailedList.size());
         icUserChangeDetailedService.insertBatch(detailedList);
     }
 

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<IcUserTrans
                 .append(result1.getData().getNeighborHoodDTO().getNeighborHoodName()).append("-").append(result1.getData().getBuildingDTO().getBuildingName()).append("-")
                 .append(result1.getData().getBuildingUnitDTO().getUnitName()).append("-").append(result1.getData().getHouseDTO().getHouseName());
         changeRecordEntity.setBeforeChangeName(beforeName.toString());
-        StringBuffer afterName = new StringBuffer("-");
+        StringBuffer afterName = new StringBuffer();
         if ("in".equals(formDTO.getType())) {
             afterName.append(result2.getData().getAgencyDTO().getOrganizationName()).append("-").append(result2.getData().getGridDTO().getGridName()).append("-")
                     .append(result2.getData().getNeighborHoodDTO().getNeighborHoodName()).append("-").append(result2.getData().getBuildingDTO().getBuildingName()).append("-")
                     .append(result2.getData().getBuildingUnitDTO().getUnitName()).append("-").append(result2.getData().getHouseDTO().getHouseName());
         }
-        changeRecordEntity.setAfterChangeName(afterName.toString());
+        changeRecordEntity.setAfterChangeName(StringUtils.isEmpty(afterName.toString()) ? "-" : afterName.toString());
         changeRecordEntity.setChangeTime(formDTO.getTransferTime());
         changeRecordEntity.setRemark(formDTO.getRemark());
         icUserChangeRecordService.insert(changeRecordEntity);

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -611,7 +611,7 @@
         FROM
             ic_resi_user iru
         <!-- 只查询在变更记录表不存在新增节点的居民 -->
-        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'