From cb734129b410c02275c0f2fc5e820d6ccc0e17c0 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 18 Jun 2024 18:12:20 +0800
Subject: [PATCH] 出租屋查询房东信息
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 7b04ed6..ed7cc9d 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -97,8 +97,6 @@
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
- StopWatch stopWatch = new StopWatch();
- stopWatch.start();
CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, household);
// List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
@@ -107,10 +105,26 @@
if (Objects.nonNull(household.getLabelType())) {
extracted(household);
}
+ StopWatch stopWatch = new StopWatch();
+ stopWatch.start();
List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household, commonParamSet.getIsAdministrator(),
commonParamSet.getRegionChildCodesList(), commonParamSet.getGridCodeList());
stopWatch.stop();
-// System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
+ if (household.getRelationship() == 18) {
+ householdVOS.forEach(item -> {
+ HouseholdEntity householdEntity = getOne(Wrappers.<HouseholdEntity>lambdaQuery()
+ .eq(HouseholdEntity::getHouseCode, item.getHouseCode())
+ .eq(HouseholdEntity::getRelationship, 1)
+ .eq(HouseholdEntity::getIsDeleted, 0)
+ .last("limit 1"));
+ if (householdEntity != null) {
+ item.setHouseName(householdEntity.getName());
+ item.setHousePhone(householdEntity.getPhoneNumber());
+ item.setHouseIdCard(householdEntity.getIdCard());
+ }
+ });
+ }
+ System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
return page.setRecords(householdVOS);
}
@@ -341,7 +355,6 @@
* @param isCovered
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered, String isTenant) {
IHouseService houseService = SpringUtils.getBean(IHouseService.class);
int totalNum = data.size();
@@ -364,7 +377,7 @@
for (Future<Map<String, String>> future : futures) {
try {
Map<String, String> stringStringMap = future.get();
- logger.info("结果：{}", stringStringMap);
+ // logger.info("结果：{}", stringStringMap);
String result = stringStringMap.get("restult");
switch (result) {
case "1":
@@ -385,7 +398,7 @@
break;
}
// 获取并打印每个任务的结果
- } catch (InterruptedException | ExecutionException e) {
+ } catch (Exception e) {
errorNum++;
logger.error("获取异常-----》", e);
}
@@ -411,11 +424,10 @@
return builder.toString();
}
-
+ @Transactional(rollbackFor = Exception.class)
public Map<String, String> importHouseHold(ImportHouseholdExcel houseHoldExcel, IHouseService houseService, Boolean isCovered, String isTenant) {
Map<String, String> objectObjectHashMap = new HashMap<>();
- try {
- HouseholdEntity householdEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
+ HouseholdEntity householdEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
// 判断姓名，手机号
if (Strings.isBlank(householdEntity.getName()) || Strings.isBlank(householdEntity.getHouseCode())) {
objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
@@ -552,13 +564,6 @@
objectObjectHashMap.put("restult", "2");
return objectObjectHashMap;
}
- } catch (Exception e) {
- logger.error("异常导入------------》", e);
- // return "3";
- // objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
- objectObjectHashMap.put("restult", "3");
- return objectObjectHashMap;
- }
}
/**
--
Gitblit v1.9.3