傅行帆 il y a 4 ans
Parent
révision
72db82524d

+ 18
- 5
src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java Voir le fichier

1
 package com.huiju.estateagents.property.service.impl;
1
 package com.huiju.estateagents.property.service.impl;
2
 
2
 
3
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
4
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
 import com.baomidou.mybatisplus.core.metadata.IPage;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
6
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
7
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
450
         ResponseBean responseBean = new ResponseBean();
451
         ResponseBean responseBean = new ResponseBean();
451
         responseBean = getExcelData(file);
452
         responseBean = getExcelData(file);
452
 
453
 
454
+        if (responseBean.getCode() != 1000){
455
+            return responseBean;
456
+        }
453
         //获取要上传的数据
457
         //获取要上传的数据
454
         Map<String,Object> map = (Map<String, Object>) responseBean.getData();
458
         Map<String,Object> map = (Map<String, Object>) responseBean.getData();
455
         List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
459
         List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
456
         
460
         
457
         //批量插入
461
         //批量插入
458
         list.forEach(e -> {
462
         list.forEach(e -> {
463
+            // 校验是否存在重复房源
459
             e.setOrgId(userElement.getOrgId());
464
             e.setOrgId(userElement.getOrgId());
460
             e.setVerifyStatus("0");
465
             e.setVerifyStatus("0");
461
             e.setPairStatus("0");
466
             e.setPairStatus("0");
711
                     responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
716
                     responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
712
                     return responseBean;
717
                     return responseBean;
713
                 }
718
                 }
714
-    
719
+                LambdaQueryWrapper<TpBuildingOwnerInfo> ownerInfoQueryWrapper = new LambdaQueryWrapper<>();
720
+                ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getOwnerTel,ownerTel);
721
+                ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getRoomNoId,roomNoId);
722
+                TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(ownerInfoQueryWrapper);
723
+                if (null != tpBuildingOwnerInfo){
724
+                    responseBean.addError("第" + currentRow + "行" + "户主已存在!");
725
+                    return responseBean;
726
+                }
727
+
715
 //                if (temBuildingList.contains(roomNoId)){
728
 //                if (temBuildingList.contains(roomNoId)){
716
 //                    logger.info("存在重复房源:{}",roomNoId);
729
 //                    logger.info("存在重复房源:{}",roomNoId);
717
 //                    responseBean.addError("第"+ currentRow +"行存在重复房源");
730
 //                    responseBean.addError("第"+ currentRow +"行存在重复房源");
864
 
877
 
865
         ResponseBean responseBean = new ResponseBean();
878
         ResponseBean responseBean = new ResponseBean();
866
         ids.stream().forEach(e->{
879
         ids.stream().forEach(e->{
867
-            QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
868
-            buildingOwnerInfoQueryWrapper.eq("ta_user_verify_id", e);
869
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(buildingOwnerInfoQueryWrapper);
880
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
870
             if (null != tpBuildingOwnerInfo) {
881
             if (null != tpBuildingOwnerInfo) {
871
                 tpBuildingOwnerInfoMapper.deleteById(tpBuildingOwnerInfo.getId());
882
                 tpBuildingOwnerInfoMapper.deleteById(tpBuildingOwnerInfo.getId());
872
             }
883
             }
873
-            taUserVerifyMapper.deleteById(e);
884
+            if (null != tpBuildingOwnerInfo.getTaUserVerifyId()){
885
+                taUserVerifyMapper.deleteById(tpBuildingOwnerInfo.getTaUserVerifyId());
886
+            }
874
 
887
 
875
             // 作废话题
888
             // 作废话题
876
 //            tpTransactionMapper.invalidByUuidAndUuidType(e, "app");
889
 //            tpTransactionMapper.invalidByUuidAndUuidType(e, "app");

+ 2
- 7
src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java Voir le fichier

314
         taUserVerify.setLoginName(currentUser.getName());
314
         taUserVerify.setLoginName(currentUser.getName());
315
 
315
 
316
         // 开始查询 业主
316
         // 开始查询 业主
317
-        TaUserVerify userVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
318
-        if (null != userVerify) {
319
-            TaUser taUser = taUserMapper.selectById(userVerify.getPersonId());
320
-            taUserVerify.setOwnerName(taUser.getUserName());
321
-        }
322
-
317
+//        TaUserVerify userVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
323
         responseBean.addSuccess(taUserVerify);
318
         responseBean.addSuccess(taUserVerify);
324
         return responseBean;
319
         return responseBean;
325
     }
320
     }
404
                 tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
399
                 tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
405
                 tpBuildingOwnerInfo.setCreateUser(-1);
400
                 tpBuildingOwnerInfo.setCreateUser(-1);
406
                 tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
401
                 tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
407
-                tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
402
+                tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
408
 
403
 
409
                 taUserVerify.setVerifyStatus("1");
404
                 taUserVerify.setVerifyStatus("1");
410
                 taUserVerify.setVerifyName("自动审核通过");
405
                 taUserVerify.setVerifyName("自动审核通过");