From e66b0932eb782c6ec771ffaa9957e6d5d5361286 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 07 Aug 2018 12:49:06 +0800
Subject: [PATCH] 增加 年查询
---
src/main/java/com/moral/service/impl/AreaServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AreaServiceImpl.java b/src/main/java/com/moral/service/impl/AreaServiceImpl.java
index fbf3730..3f5b3db 100644
--- a/src/main/java/com/moral/service/impl/AreaServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AreaServiceImpl.java
@@ -3,9 +3,13 @@
import com.moral.entity.Area;
import com.moral.entity.City;
import com.moral.entity.Province;
+import com.moral.entity.Town;
+import com.moral.entity.Village;
import com.moral.mapper.AreaMapper;
import com.moral.mapper.CityMapper;
import com.moral.mapper.ProvinceMapper;
+import com.moral.mapper.TownMapper;
+import com.moral.mapper.VillageMapper;
import com.moral.service.AreaService;
import org.springframework.stereotype.Service;
import tk.mybatis.mapper.entity.Example;
@@ -22,6 +26,12 @@
CityMapper cityMapper;
@Resource
AreaMapper areaMapper;
+
+ @Resource
+ private TownMapper townMapper;
+
+ @Resource
+ private VillageMapper villageMapper;
@Override
public List<Province> getProvinces() {
@@ -58,18 +68,35 @@
String cityCode = codeStr.substring(0,4)+"00";
City city = cityMapper.selectByPrimaryKey(Integer.valueOf(cityCode));
Area area = areaMapper.selectByPrimaryKey(code);
- fullName = province.getProvinceName()+city.getCityName()+area.getAreaName();
+ fullName = province.getProvinceName().replaceAll(" ", "")
+ +" "+city.getCityName().replaceAll(" ", "")
+ +" "+area.getAreaName().replaceAll(" ", "");
} else if(!codeStr.endsWith("0000")){
// ��������� ���������code
String provinceCode = codeStr.substring(0,2)+"0000";
Province province = provinceMapper.selectByPrimaryKey(Integer.valueOf(provinceCode));
City city = cityMapper.selectByPrimaryKey(code);
- fullName = province.getProvinceName()+city.getCityName();
+ fullName = province.getProvinceName().replaceAll(" ", "")
+ +" "+city.getCityName().replaceAll(" ", "");
} else {
// ��������� ���code
Province province = provinceMapper.selectByPrimaryKey(code);
- fullName = province.getProvinceName();
+ fullName = province.getProvinceName().replaceAll(" ", "");
}
return fullName;
}
+
+ @Override
+ public List<Town> getTowns(Integer areaCode) {
+ Example example = new Example(Town.class);
+ example.or().andEqualTo("areaCode",areaCode);
+ return townMapper.selectByExample(example);
+ }
+
+ @Override
+ public List<Village> getVillages(Long townCode) {
+ Example example = new Example(Village.class);
+ example.createCriteria().andEqualTo("townCode",townCode);
+ return villageMapper.selectByExample(example);
+ }
}
--
Gitblit v1.8.0