From 40a647b468d117381abf63d9f98f1cc9308ef3fc Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 27 Mar 2024 10:23:47 +0800
Subject: [PATCH] 议事查询优化
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 3109bed..1625b1a 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -50,10 +50,9 @@
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
-import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
-import org.springblade.modules.policeAlarmRecords.service.IPoliceAlarmRecordsService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
@@ -612,16 +611,19 @@
}
}
+ /**
+ * 通过小区id查询物业人员
+ *
+ * @param districtId
+ * @param building
+ * @return
+ */
@Override
public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
return baseMapper.getUserInfoByDistrictId(districtId, building);
}
- @Override
- public List<User> getUserInfoByDistrictIds(String districtIds) {
- List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
- return baseMapper.getUserInfoByDistrictIds(list);
- }
+
/**
* 处理漏绑定的user_dept
@@ -831,14 +833,16 @@
@Override
public List<User> getPoliceUser(String longitude, String latitude, String houseCode) {
List<User> policeUser = baseMapper.getPoliceUser(longitude, latitude);
- // todo 自动生成警单
- IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
- PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
- policeAlarmRecordsEntity.setHouseCode(houseCode);
- if (policeUser != null && policeUser.size() == 1) {
- policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
- }
- policeAlarmRecordsService.save(policeAlarmRecordsEntity);
+ // 自动生成警单
+// if (StringUtils.isNotBlank(houseCode)) {
+// IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
+// PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
+// policeAlarmRecordsEntity.setHouseCode(houseCode);
+// if (policeUser != null && policeUser.size() == 1) {
+// policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
+// }
+// policeAlarmRecordsService.save(policeAlarmRecordsEntity);
+// }
return policeUser;
}
}
--
Gitblit v1.9.3