房屋导入

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java

@@ -9,6 +9,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.util.Date;
+import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -318,7 +319,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      */
     public static String dateFormatExample(String originalDateString) {
         String targetFormat = "yyyy-MM-dd";
-        SimpleDateFormat originalFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy");
+        SimpleDateFormat originalFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy", Locale.US);
         try {
             Date date = originalFormat.parse(originalDateString);
             SimpleDateFormat targetFormatObj = new SimpleDateFormat(targetFormat);

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/HouseInfoServiceImpl.java

@@ -27,6 +27,7 @@ import org.dromara.system.domain.vo.SysDictDataVo;
 import org.dromara.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -182,6 +183,7 @@ public class HouseInfoServiceImpl implements IHouseInfoService {
     }
 
     @Override
+    @Transactional
     public AjaxResult importHouseInfo(List<HouseInfoVoDr> houseInfoList) {
         if (houseInfoList == null || houseInfoList.size() < 1) {
             return AjaxResult.error("当前表格数据为空");

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/ResidentInfoServiceImpl.java

@@ -355,16 +355,19 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
 
         //校验账号是否存在,如果存在则不新增账号
         //校验该租户下居住人员是否存在
-        boolean existUser = TenantHelper.ignore(() -> {
+        /*boolean existUser = TenantHelper.ignore(() -> {
             return sysUserMapper.exists(new LambdaQueryWrapper<SysUser>().eq(SysUser::getTenantId, tenantId)
                 .eq(SysUser::getPhonenumber, add.getResidentPhone()));
+        });*/
+        SysUserVo sysUserVo = TenantHelper.ignore(() -> {
+            return sysUserMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, residentPhone).eq(SysUser::getTenantId,tenantId));
         });
         //新增账号信息
         Long userId;
         SysUserBo user = new SysUserBo();
         user.setTenantId(tenantId);
         user.setIsAuthentication(TWO);
-        if (!existUser) {
+        if (sysUserVo == null) {
             user.setUserName(residentPhone);
             user.setPhonenumber(residentPhone);
             user.setUserName(residentPhone);
@@ -382,9 +385,9 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
             userId = sysUser.getUserId();
         } else {
             //从sysUser表中查询
-            SysUserVo sysUserVo = TenantHelper.ignore(() -> {
-                return sysUserMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, residentPhone));
-            });
+            /*SysUserVo sysUserVo = TenantHelper.ignore(() -> {
+                return sysUserMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, residentPhone).eq(SysUser::getTenantId,tenantId));
+            });*/
             //更新数据
             userId = sysUserVo.getUserId();
             user.setUserId(userId);