Tenlion/btxtgxq-system-city
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

房屋管理批量导入bug修改。

Browse Source
This commit is contained in:
Renpc-kilig 2021-10-13 18:12:59 +08:00
parent 017419e79a
commit 0cc01615ef
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/cm/systemcity/service/citybuilding/ICityBuildingService.java
View File

@ -25,11 +25,12 @@ public interface ICityBuildingService {
/** /**
* 根据名称获取 * 根据名称获取
* @param districtName
* @param buildingName * @param buildingName
* @return * @return
* @throws SearchException * @throws SearchException
*/ */
CityBuildingDTO getCityBuildingByName(String buildingName) throws SearchException; CityBuildingDTO getCityBuildingByName(String districtName, String buildingName) throws SearchException;
/** /**
* 获取小区的楼宇 * 获取小区的楼宇
* @param districtIds * @param districtIds

3
src/main/java/com/cm/systemcity/service/citybuilding/impl/CityBuildingServiceImpl.java
View File

@ -383,8 +383,9 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui
} }
@Override @Override
public CityBuildingDTO getCityBuildingByName(String buildingName) throws SearchException { public CityBuildingDTO getCityBuildingByName(String districtName, String buildingName) throws SearchException {
Map<String, Object> params = super.getHashMap(1); Map<String, Object> params = super.getHashMap(1);
params.put("districtName", districtName);
params.put("buildingName", buildingName); params.put("buildingName", buildingName);
return cityBuildingDao.getCityBuilding(params); return cityBuildingDao.getCityBuilding(params);
} }

3
src/main/java/com/cm/systemcity/utils/ImportExcelHelper.java
View File

@ -120,11 +120,12 @@ public class ImportExcelHelper {
} }
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("districtName", buildingHouseModel.getDistrictName()); param.put("districtName", buildingHouseModel.getDistrictName());
param.put("buildingName", buildingHouseModel.getCityBuildingName());
CityDistrictDTO cityDistrictDTO = cityDistrictService.getCityDistrictByName(buildingHouseModel.getDistrictName()); CityDistrictDTO cityDistrictDTO = cityDistrictService.getCityDistrictByName(buildingHouseModel.getDistrictName());
if(null != cityDistrictDTO) { if(null != cityDistrictDTO) {
buildingHouseModel.setDistrictId(cityDistrictDTO.getCityDistrictId()); buildingHouseModel.setDistrictId(cityDistrictDTO.getCityDistrictId());
} }
CityBuildingDTO cityBuildingDTO = cityBuildingService.getCityBuildingByName(buildingHouseModel.getCityBuildingName()); CityBuildingDTO cityBuildingDTO = cityBuildingService.getCityBuildingByName(buildingHouseModel.getDistrictName(), buildingHouseModel.getCityBuildingName());
if(null != cityBuildingDTO) { if(null != cityBuildingDTO) {
buildingHouseModel.setCityBuildingId(cityBuildingDTO.getCityBuildingId()); buildingHouseModel.setCityBuildingId(cityBuildingDTO.getCityBuildingId());
} }

6
src/main/resources/mybatis/mapper/citybuilding/citybuilding-mapper.xml
View File

@ -137,11 +137,15 @@
AND AND
t1.city_building_id = #{cityBuildingId} t1.city_building_id = #{cityBuildingId}
</if> </if>
<if test="districtName != null and districtName != ''">
AND
t1.district_name = #{districtName}
</if>
<if test="buildingName != null and buildingName != ''"> <if test="buildingName != null and buildingName != ''">
AND AND
t1.building_name = #{buildingName} t1.building_name = #{buildingName}
LIMIT 0, 1
</if> </if>
LIMIT 0, 1
</select> </select>
<!-- 楼宇管理列表 --> <!-- 楼宇管理列表 -->