Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

@@ -1572,7 +1572,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
             if (!StringUtils.isAllBlank(categoryDescBefore, categoryDescAfter)) {
                 IcUserChangeRecordEntity categoryChangeRecord = fillChangeRecord(loginUserCustomerId, resiId, resiName, transferRecord.getId(), operator.getStaffId(),
-                        operator.getRealName(), categoryDescBefore, categoryDescAfter , "category", "类别", "", now);
+                        operator.getRealName(), categoryDescBefore, categoryDescAfter , "transfer", "调动", "", now);
                 icUserChangeRecordDao.insert(categoryChangeRecord);
             }
 
@@ -1586,7 +1586,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 if ("1".equals(oldValue)) {
                     IcUserChangeDetailedEntity changeDetail = fillChangeDetail(loginUserCustomerId, resiId, transferChangeRecord.getId(), oldAgencyId,
                             oldGridId, oldvillageId, oldBuildId, oldUnitId,
-                            oldHomeId, transferChangeRecord.getType(), transferChangeRecord.getTypeName(), key, -1, pids);
+                            oldHomeId, "out", "迁出", key, -1, pids);
                     icUserChangeDetailedDao.insert(changeDetail);
                 }
             }
@@ -1600,7 +1600,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 if ("1".equals(newValue)) {
                     IcUserChangeDetailedEntity changeDetail = fillChangeDetail(loginUserCustomerId, resiId, transferChangeRecord.getId(), newAgencyId,
                             newGridId, newvillageId, newBuildId, newUnitId,
-                            newHomeId, transferChangeRecord.getType(), transferChangeRecord.getTypeName(), key, 1, pids);
+                            newHomeId, "in", "迁入", key, 1, pids);
                     icUserChangeDetailedDao.insert(changeDetail);
                 }
             }